summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorFernando Sahmkow <fsahmkow27@gmail.com>2021-08-08 17:34:43 +0200
committerFernando Sahmkow <fsahmkow27@gmail.com>2021-08-08 20:24:53 +0200
commit23ca1eb82ee47e533e92ee9ccdc82a92647d1009 (patch)
tree7aba2383222dd1ed147833d916466760b0e007dd /src
parentMerge pull request #6834 from K0bin/buffer-image-granularity (diff)
downloadyuzu-23ca1eb82ee47e533e92ee9ccdc82a92647d1009.tar
yuzu-23ca1eb82ee47e533e92ee9ccdc82a92647d1009.tar.gz
yuzu-23ca1eb82ee47e533e92ee9ccdc82a92647d1009.tar.bz2
yuzu-23ca1eb82ee47e533e92ee9ccdc82a92647d1009.tar.lz
yuzu-23ca1eb82ee47e533e92ee9ccdc82a92647d1009.tar.xz
yuzu-23ca1eb82ee47e533e92ee9ccdc82a92647d1009.tar.zst
yuzu-23ca1eb82ee47e533e92ee9ccdc82a92647d1009.zip
Diffstat (limited to 'src')
-rw-r--r--src/yuzu_cmd/CMakeLists.txt1
-rw-r--r--src/yuzu_cmd/emu_window/emu_window_sdl2.cpp1
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 @@
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)
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() {
}
}
+// 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) {