AxioDL
/
metaforce
mirror of https://github.com/AxioDL/metaforce.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Move SDL2 import before boo

This commit is contained in:
Luke Street 2022-05-31 20:59:59 -04:00
parent 52c8a82283
commit 80eb125631
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
extern/CMakeLists.txt vendored
View File

@ -38,6 +38,15 @@ else ()
include(athena/atdna/atdnaHelpers.cmake) include(athena/atdna/atdnaHelpers.cmake)
endif () endif ()
if (WIN32)
set(SDL_LIBC ON CACHE BOOL "Use the system C library" FORCE)
endif ()
add_subdirectory(../extern/SDL SDL2 EXCLUDE_FROM_ALL)
if (NOT MSVC)
target_compile_options(SDL2-static PRIVATE -Wno-implicit-fallthrough -Wno-shadow)
endif ()
# boo must come after SDL2
add_subdirectory(boo EXCLUDE_FROM_ALL) add_subdirectory(boo EXCLUDE_FROM_ALL)
add_subdirectory(nod EXCLUDE_FROM_ALL) add_subdirectory(nod EXCLUDE_FROM_ALL)
# amuse must come after athena/atdna, boo and nod # amuse must come after athena/atdna, boo and nod
@ -90,14 +99,6 @@ else ()
message(WARNING "nativefiledialog unsupported for ${CMAKE_SYSTEM_NAME}") message(WARNING "nativefiledialog unsupported for ${CMAKE_SYSTEM_NAME}")
endif () endif ()
if (WIN32)
set(SDL_LIBC ON CACHE BOOL "Use the system C library" FORCE)
endif ()
add_subdirectory(../extern/SDL SDL2 EXCLUDE_FROM_ALL)
if (NOT MSVC)
target_compile_options(SDL2-static PRIVATE -Wno-implicit-fallthrough -Wno-shadow)
endif ()
# Enable MoltenVK # Enable MoltenVK
#if (CMAKE_SYSTEM_NAME STREQUAL Darwin) #if (CMAKE_SYSTEM_NAME STREQUAL Darwin)
# set(DAWN_ENABLE_VULKAN ON CACHE BOOL "Enable compilation of the Vulkan backend" FORCE) # set(DAWN_ENABLE_VULKAN ON CACHE BOOL "Enable compilation of the Vulkan backend" FORCE)