diff options
| author | 2021-08-08 11:31:47 -0700 | |
|---|---|---|
| committer | 2021-08-08 11:31:47 -0700 | |
| commit | b9eee1c5391204f79e94543b368c6168105dda5a (patch) | |
| tree | 7aba2383222dd1ed147833d916466760b0e007dd | |
| parent | Merge pull request #6834 from K0bin/buffer-image-granularity (diff) | |
| parent | yuzu-cmd/CMakeLists: Correct attribution for this function. (diff) | |
| download | yuzu-b9eee1c5391204f79e94543b368c6168105dda5a.tar.gz yuzu-b9eee1c5391204f79e94543b368c6168105dda5a.tar.xz yuzu-b9eee1c5391204f79e94543b368c6168105dda5a.zip | |
Merge pull request #6843 from FernandoS27/lives-in-a-pineapple-under-the-sea-2
yuzu-cmd/CMakeLists: Correct attribution for this function.
Diffstat (limited to '')
| -rw-r--r-- | src/yuzu_cmd/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | src/yuzu_cmd/emu_window/emu_window_sdl2.cpp | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/src/yuzu_cmd/CMakeLists.txt b/src/yuzu_cmd/CMakeLists.txt index e55a19649..74fc24972 100644 --- a/src/yuzu_cmd/CMakeLists.txt +++ b/src/yuzu_cmd/CMakeLists.txt | |||
| @@ -1,5 +1,6 @@ | |||
| 1 | set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PROJECT_SOURCE_DIR}/CMakeModules) | 1 | set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PROJECT_SOURCE_DIR}/CMakeModules) |
| 2 | 2 | ||
| 3 | # Credits to Samantas5855 and others for this function. | ||
| 3 | function(create_resource file output filename) | 4 | function(create_resource file output filename) |
| 4 | # Read hex data from file | 5 | # Read hex data from file |
| 5 | file(READ ${file} filedata HEX) | 6 | file(READ ${file} filedata HEX) |
diff --git a/src/yuzu_cmd/emu_window/emu_window_sdl2.cpp b/src/yuzu_cmd/emu_window/emu_window_sdl2.cpp index c80f7791c..87fce0c23 100644 --- a/src/yuzu_cmd/emu_window/emu_window_sdl2.cpp +++ b/src/yuzu_cmd/emu_window/emu_window_sdl2.cpp | |||
| @@ -232,6 +232,7 @@ void EmuWindow_SDL2::WaitEvent() { | |||
| 232 | } | 232 | } |
| 233 | } | 233 | } |
| 234 | 234 | ||
| 235 | // Credits to Samantas5855 and others for this function. | ||
| 235 | void EmuWindow_SDL2::SetWindowIcon() { | 236 | void EmuWindow_SDL2::SetWindowIcon() { |
| 236 | SDL_RWops* const yuzu_icon_stream = SDL_RWFromConstMem((void*)yuzu_icon, yuzu_icon_size); | 237 | SDL_RWops* const yuzu_icon_stream = SDL_RWFromConstMem((void*)yuzu_icon, yuzu_icon_size); |
| 237 | if (yuzu_icon_stream == nullptr) { | 238 | if (yuzu_icon_stream == nullptr) { |