summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorStanislaw Halik <sthalik@misaki.pl>2024-08-10 22:09:19 +0200
committerStanislaw Halik <sthalik@misaki.pl>2024-08-11 11:07:57 +0200
commitcf31856e66e077430f6243ef24c13b94aa1d8c62 (patch)
tree96f0cc849a37afaa8f9ced5065f2a79a24177e87
parent40b0f2bb552f3b90748da0b0447853f29900650b (diff)
cmake: use system sdl2 except for msvc
-rw-r--r--userconfig-sthalik@Windows-Clang.cmake4
-rw-r--r--userconfig-sthalik@Windows-GNU.cmake2
2 files changed, 1 insertions, 5 deletions
diff --git a/userconfig-sthalik@Windows-Clang.cmake b/userconfig-sthalik@Windows-Clang.cmake
index dc0ba1dd..524ccf77 100644
--- a/userconfig-sthalik@Windows-Clang.cmake
+++ b/userconfig-sthalik@Windows-Clang.cmake
@@ -46,8 +46,6 @@ if(NOT CMAKE_CXX_COMPILER_VERSION LESS "18.0")
add_compile_options($<$<COMPILE_LANGUAGE:CXX>:-fassume-nothrow-exception-dtor>)
endif()
-set(FLOORMAT_SUBMODULE-SDL2 1)
-
# for building submodule dependencies
function(fm-userconfig-external)
add_compile_options(
@@ -58,7 +56,7 @@ function(fm-userconfig-external)
)
if(NOT CMAKE_BUILD_TYPE STREQUAL "DEBUG")
sets(BOOL
- FLOORMAT_SUBMODULE-SDL2 ON
+ #FLOORMAT_SUBMODULE-SDL2 ON
SDL_SHARED OFF
SDL_STATIC ON
CORRADE_BUILD_STATIC ON
diff --git a/userconfig-sthalik@Windows-GNU.cmake b/userconfig-sthalik@Windows-GNU.cmake
index 0ed7566a..10fe46c5 100644
--- a/userconfig-sthalik@Windows-GNU.cmake
+++ b/userconfig-sthalik@Windows-GNU.cmake
@@ -29,8 +29,6 @@ endif()
add_compile_definitions("$<$<CONFIG:Debug,DEBUG>:_FORTIFY_SOURCE=3>")
add_compile_definitions("$<IF:$<CONFIG:Debug,DEBUG>,,_FORTIFY_SOURCE=3>")
-set(FLOORMAT_SUBMODULE-SDL2 1)
-
# for building submodule dependencies
function(fm-userconfig-external)
add_compile_options(