From 3f3672b5ab7e9676747e4cd106b60448746f0df2 Mon Sep 17 00:00:00 2001 From: Gary Miguel Date: Wed, 31 Jan 2024 17:15:33 -0800 Subject: [PATCH] TODO squash try to fix double definition properly --- CMakeLists.txt | 2 +- include/IrrCompileConfig.h | 4 ---- source/Irrlicht/CMakeLists.txt | 2 +- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 519896df2..bb0408d91 100644 --- 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 index fbd7c7904..24972ca7f 100644 --- 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 // 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 index 0a5e2779d..b588d83c3 100644 --- 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