TODO squash try to fix double definition properly

Astera-org · Feb 1, 2024 · 3f3672b · 3f3672b
1 parent 10bf72a
commit 3f3672b
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 6 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -22,7 +22,7 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
 include(GNUInstallDirs)
 
 if(ANDROID)
-	set(sysname Android)
+	e et(sysname Android)
 elseif(APPLE)
 	set(sysname OSX)
 elseif(MSVC)

diff --git a/include/IrrCompileConfig.h b/include/IrrCompileConfig.h
@@ -17,10 +17,6 @@
 #define IRRLICHT_VERSION_SVN alpha
 #define IRRLICHT_SDK_VERSION "1.9.0" IRRLICHT_VERSION_MT
 
-#if RENDER_HEADLESS // from https://github.com/EleutherAI/irrlicht
-#define _IRR_COMPILE_WITH_SDL_DEVICE_
-#endif
-
 #include <stdio.h> // TODO: Although included elsewhere this is required at least for mingw
 
 #ifdef _WIN32

diff --git a/source/Irrlicht/CMakeLists.txt b/source/Irrlicht/CMakeLists.txt
@@ -122,7 +122,7 @@ elseif(DEVICE STREQUAL "SDL")
 	message(FATAL_ERROR "SDL was used but not enabled?!")
 endif()
 
-add_definitions("-D_IRR_COMPILE_WITH_${DEVICE}_DEVICE_")
+target_compile_definitions(IrrlichtMt PUBLIC "_IRR_COMPILE_WITH_${DEVICE}_DEVICE_")
 
 # X11
-Original file line number
+Diff line change
@@ Expand Up / @@ -122,7 +122,7 @@ elseif(DEVICE STREQUAL "SDL") @@
     	message(FATAL_ERROR "SDL was used but not enabled?!")
     endif()
-    add_definitions("-D_IRR_COMPILE_WITH_${DEVICE}_DEVICE_")
+    target_compile_definitions(IrrlichtMt PUBLIC "_IRR_COMPILE_WITH_${DEVICE}_DEVICE_")
     # X11
@@ Expand Down @@