Merge branch 'main' into animation-system

lamarrr · Dec 7, 2024 · 4105331 · 4105331
2 parents bb2f034 + efc963c
commit 4105331
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -31,6 +31,13 @@ set(SPIRV_REFLECT_STATIC_LIB
 set(SDL_STATIC
     ON
     CACHE BOOL "")
+set(SDL_JOYSTICK
+    OFF
+    CACHE BOOL "")
+set(SDL_HAPTIC
+    OFF
+    CACHE BOOL "")
+
 
 include(FetchContent)
 
@@ -253,4 +260,4 @@ add_executable(
 target_link_libraries(ashura_engine_tests ashura_std ashura_engine GTest::gtest)
 
 add_executable(ashura_editor ashura/editor/editor.cc)
-target_link_libraries(ashura_editor ashura_std ashura_engine GTest::gtest)
+target_link_libraries(ashura_editor ashura_std ashura_engine GTest::gtest)