mirror of
https://git.suyu.dev/suyu/suyu.git
synced 2025-08-15 23:09:26 +00:00
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)
|
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}")
|
||||||
|
|
|
@ -12,54 +12,57 @@ 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()
|
||||||
|
|
||||||
add_executable(suyu-cmd
|
if (SUZU_CMD)
|
||||||
emu_window/emu_window_sdl2.cpp
|
add_executable(suyu-cmd
|
||||||
emu_window/emu_window_sdl2.h
|
emu_window/emu_window_sdl2.cpp
|
||||||
emu_window/emu_window_sdl2_gl.cpp
|
emu_window/emu_window_sdl2.h
|
||||||
emu_window/emu_window_sdl2_gl.h
|
emu_window/emu_window_sdl2_gl.cpp
|
||||||
emu_window/emu_window_sdl2_null.cpp
|
emu_window/emu_window_sdl2_gl.h
|
||||||
emu_window/emu_window_sdl2_null.h
|
emu_window/emu_window_sdl2_null.cpp
|
||||||
emu_window/emu_window_sdl2_vk.cpp
|
emu_window/emu_window_sdl2_null.h
|
||||||
emu_window/emu_window_sdl2_vk.h
|
emu_window/emu_window_sdl2_vk.cpp
|
||||||
precompiled_headers.h
|
emu_window/emu_window_sdl2_vk.h
|
||||||
sdl_config.cpp
|
precompiled_headers.h
|
||||||
sdl_config.h
|
sdl_config.cpp
|
||||||
suyu.cpp
|
sdl_config.h
|
||||||
suyu.rc
|
suyu.cpp
|
||||||
)
|
suyu.rc
|
||||||
|
)
|
||||||
|
|
||||||
target_link_libraries(suyu-cmd PRIVATE common core input_common frontend_common)
|
target_link_libraries(suyu-cmd PRIVATE common core input_common frontend_common)
|
||||||
target_link_libraries(suyu-cmd PRIVATE glad)
|
target_link_libraries(suyu-cmd PRIVATE glad)
|
||||||
if (MSVC)
|
if (MSVC)
|
||||||
target_link_libraries(suyu-cmd PRIVATE getopt)
|
target_link_libraries(suyu-cmd PRIVATE getopt)
|
||||||
endif()
|
|
||||||
target_link_libraries(suyu-cmd PRIVATE ${PLATFORM_LIBRARIES} Threads::Threads)
|
|
||||||
|
|
||||||
create_resource("../../dist/suyu.bmp" "suyu_cmd/suyu_icon.h" "suyu_icon")
|
|
||||||
target_include_directories(suyu-cmd PRIVATE ${RESOURCES_DIR})
|
|
||||||
|
|
||||||
target_link_libraries(suyu-cmd PRIVATE SDL2::SDL2 Vulkan::Headers)
|
|
||||||
|
|
||||||
if(UNIX AND NOT APPLE)
|
|
||||||
install(TARGETS suyu-cmd)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
if(WIN32)
|
|
||||||
# compile as a win32 gui application instead of a console application
|
|
||||||
if(MSVC)
|
|
||||||
set_target_properties(suyu-cmd PROPERTIES LINK_FLAGS_RELEASE "/SUBSYSTEM:WINDOWS /ENTRY:mainCRTStartup")
|
|
||||||
elseif(MINGW)
|
|
||||||
set_target_properties(suyu-cmd PROPERTIES LINK_FLAGS_RELEASE "-Wl,--subsystem,windows")
|
|
||||||
endif()
|
endif()
|
||||||
endif()
|
target_link_libraries(suyu-cmd PRIVATE ${PLATFORM_LIBRARIES} Threads::Threads)
|
||||||
|
|
||||||
if (MSVC)
|
create_resource("../../dist/suyu.bmp" "suyu_cmd/suyu_icon.h" "suyu_icon")
|
||||||
include(CopySuyuSDLDeps)
|
target_include_directories(suyu-cmd PRIVATE ${RESOURCES_DIR})
|
||||||
copy_suyu_SDL_deps(suyu-cmd)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
if (SUYU_USE_PRECOMPILED_HEADERS)
|
target_link_libraries(suyu-cmd PRIVATE SDL2::SDL2 Vulkan::Headers)
|
||||||
target_precompile_headers(suyu-cmd PRIVATE precompiled_headers.h)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
create_target_directory_groups(suyu-cmd)
|
if(UNIX AND NOT APPLE)
|
||||||
|
install(TARGETS suyu-cmd)
|
||||||
|
endif()
|
||||||
|
|
||||||
|
if(WIN32)
|
||||||
|
# compile as a win32 gui application instead of a console application
|
||||||
|
if(MSVC)
|
||||||
|
set_target_properties(suyu-cmd PROPERTIES LINK_FLAGS_RELEASE "/SUBSYSTEM:WINDOWS /ENTRY:mainCRTStartup")
|
||||||
|
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)
|
||||||
|
include(CopySuyuSDLDeps)
|
||||||
|
copy_suyu_SDL_deps(suyu-cmd)
|
||||||
|
endif()
|
||||||
|
|
||||||
|
if (SUYU_USE_PRECOMPILED_HEADERS)
|
||||||
|
target_precompile_headers(suyu-cmd PRIVATE precompiled_headers.h)
|
||||||
|
endif()
|
||||||
|
|
||||||
|
create_target_directory_groups(suyu-cmd)
|
||||||
|
endif()
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue