mirrors/suyu
0
0
Fork 0
mirror of https://git.suyu.dev/suyu/suyu.git synced 2025-08-18 00:11:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge commit 'a1c2940b31' into torzu-merging

Browse source
This commit is contained in:
marius david 2025-01-01 19:19:00 +01:00
commit 18220cb4d4
2 changed files with 51 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

2
CMakeLists.txt
View file

@ -58,6 +58,8 @@ option(SUYU_DOWNLOAD_ANDROID_VVL "Download validation layer binary for android"
CMAKE_DEPENDENT_OPTION(SUYU_ROOM "Compile LDN room server" ON "NOT ANDROID" OFF) CMAKE_DEPENDENT_OPTION(SUYU_ROOM "Compile LDN room server" ON "NOT ANDROID" OFF)
option(SUZU_CMD "Compile the -cmd executable (can disable if -cmd is unused)" ON)
CMAKE_DEPENDENT_OPTION(SUYU_CRASH_DUMPS "Compile crash dump (Minidump) support" OFF "WIN32 OR LINUX" OFF) CMAKE_DEPENDENT_OPTION(SUYU_CRASH_DUMPS "Compile crash dump (Minidump) support" OFF "WIN32 OR LINUX" OFF)
option(SUYU_USE_BUNDLED_VCPKG "Use vcpkg for suyu dependencies" "${MSVC}") option(SUYU_USE_BUNDLED_VCPKG "Use vcpkg for suyu dependencies" "${MSVC}")

3
src/suyu_cmd/CMakeLists.txt
View file

@ -12,6 +12,7 @@ function(create_resource file output filename)
file(WRITE "${PROJECT_BINARY_DIR}/dist/${output}" "const unsigned char ${filename}[] = {${filedata}};\nconst unsigned ${filename}_size = sizeof(${filename});\n") file(WRITE "${PROJECT_BINARY_DIR}/dist/${output}" "const unsigned char ${filename}[] = {${filedata}};\nconst unsigned ${filename}_size = sizeof(${filename});\n")
endfunction() endfunction()
if (SUZU_CMD)
add_executable(suyu-cmd add_executable(suyu-cmd
emu_window/emu_window_sdl2.cpp emu_window/emu_window_sdl2.cpp
emu_window/emu_window_sdl2.h emu_window/emu_window_sdl2.h
@ -51,6 +52,7 @@ if(WIN32)
elseif(MINGW) elseif(MINGW)
set_target_properties(suyu-cmd PROPERTIES LINK_FLAGS_RELEASE "-Wl,--subsystem,windows") set_target_properties(suyu-cmd PROPERTIES LINK_FLAGS_RELEASE "-Wl,--subsystem,windows")
endif() endif()
target_link_libraries(yuzu-cmd PRIVATE ${PLATFORM_LIBRARIES} Threads::Threads)
endif() endif()
if (MSVC) if (MSVC)
@ -63,3 +65,4 @@ if (SUYU_USE_PRECOMPILED_HEADERS)
endif() endif()
create_target_directory_groups(suyu-cmd) create_target_directory_groups(suyu-cmd)
endif()