Merge commit 'a1c2940b31' into torzu-merging
This commit is contained in:
commit
18220cb4d4
2 changed files with 51 additions and 46 deletions
|
|
@ -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)
|
||||
|
||||
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)
|
||||
|
||||
option(SUYU_USE_BUNDLED_VCPKG "Use vcpkg for suyu dependencies" "${MSVC}")
|
||||
|
|
|
|||
|
|
@ -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")
|
||||
endfunction()
|
||||
|
||||
if (SUZU_CMD)
|
||||
add_executable(suyu-cmd
|
||||
emu_window/emu_window_sdl2.cpp
|
||||
emu_window/emu_window_sdl2.h
|
||||
|
|
@ -51,6 +52,7 @@ if(WIN32)
|
|||
elseif(MINGW)
|
||||
set_target_properties(suyu-cmd PROPERTIES LINK_FLAGS_RELEASE "-Wl,--subsystem,windows")
|
||||
endif()
|
||||
target_link_libraries(yuzu-cmd PRIVATE ${PLATFORM_LIBRARIES} Threads::Threads)
|
||||
endif()
|
||||
|
||||
if (MSVC)
|
||||
|
|
@ -63,3 +65,4 @@ if (SUYU_USE_PRECOMPILED_HEADERS)
|
|||
endif()
|
||||
|
||||
create_target_directory_groups(suyu-cmd)
|
||||
endif()
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue