yuzu-emu
/
yuzu
Archived
1
0
Fork 0
Code

Merge pull request #6843 from FernandoS27/lives-in-a-pineapple-under-the-sea-2 

yuzu-cmd/CMakeLists: Correct attribution for this function.
This commit is contained in:
bunnei 2021-08-08 11:31:47 -07:00 committed by GitHub
parent 859deda3bb 23ca1eb82e
commit b9eee1c539
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/yuzu_cmd/CMakeLists.txt
View File

@ -1,5 +1,6 @@
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PROJECT_SOURCE_DIR}/CMakeModules) set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PROJECT_SOURCE_DIR}/CMakeModules)
# Credits to Samantas5855 and others for this function.
function(create_resource file output filename) function(create_resource file output filename)
# Read hex data from file # Read hex data from file
file(READ ${file} filedata HEX) file(READ ${file} filedata HEX)

1
src/yuzu_cmd/emu_window/emu_window_sdl2.cpp
View File

@ -232,6 +232,7 @@ void EmuWindow_SDL2::WaitEvent() {
} }
} }
// Credits to Samantas5855 and others for this function.
void EmuWindow_SDL2::SetWindowIcon() { void EmuWindow_SDL2::SetWindowIcon() {
SDL_RWops* const yuzu_icon_stream = SDL_RWFromConstMem((void*)yuzu_icon, yuzu_icon_size); SDL_RWops* const yuzu_icon_stream = SDL_RWFromConstMem((void*)yuzu_icon, yuzu_icon_size);
if (yuzu_icon_stream == nullptr) { if (yuzu_icon_stream == nullptr) {