Browse Source

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

yuzu-cmd/CMakeLists: Correct attribution for this function.
nce_cpp
bunnei 4 years ago
committed by GitHub
parent
commit
2c332d055d
  1. 1
      src/yuzu_cmd/CMakeLists.txt
  2. 1
      src/yuzu_cmd/emu_window/emu_window_sdl2.cpp

1
src/yuzu_cmd/CMakeLists.txt

@ -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

@ -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) {

Loading…
Cancel
Save