Browse Source
Merge pull request #6843 from FernandoS27/lives-in-a-pineapple-under-the-sea-2
yuzu-cmd/CMakeLists: Correct attribution for this function.
pull/15/merge
bunnei
4 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with
2 additions and
0 deletions
-
src/yuzu_cmd/CMakeLists.txt
-
src/yuzu_cmd/emu_window/emu_window_sdl2.cpp
|
|
|
@ -1,5 +1,6 @@ |
|
|
|
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) |
|
|
|
# Read hex data from file |
|
|
|
file(READ ${file} filedata HEX) |
|
|
|
|
|
|
|
@ -232,6 +232,7 @@ void EmuWindow_SDL2::WaitEvent() { |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
// Credits to Samantas5855 and others for this function.
|
|
|
|
void EmuWindow_SDL2::SetWindowIcon() { |
|
|
|
SDL_RWops* const yuzu_icon_stream = SDL_RWFromConstMem((void*)yuzu_icon, yuzu_icon_size); |
|
|
|
if (yuzu_icon_stream == nullptr) { |
|
|
|
|