Decouple NVMeshMender to external static library

ixray-team · Nov 30, 2024 · 14bd8b6 · 14bd8b6
1 parent 94be663
commit 14bd8b6
Show file tree

Hide file tree

Showing 31 changed files with 1,373 additions and 3,090 deletions.
diff --git a/src/3rd party/CMakeLists.txt b/src/3rd party/CMakeLists.txt
@@ -2,7 +2,7 @@
 set(IXRAY_FOLDER_3RD FOLDER "3rd Party")
 
 # 3rd libraries
-if(NOT IXRAY_COMPRESSOR_ONLY AND NOT IXRAY_PLUGINS)
+if(NOT IXRAY_COMPRESSOR_ONLY)
     add_subdirectory("luabind")
     add_subdirectory("ode")
     add_subdirectory("crypto")
@@ -18,9 +18,12 @@ if(WIN32)
     add_subdirectory("dxerr")
 endif()
 
-if(NOT IXRAY_COMPRESSOR_ONLY AND NOT IXRAY_PLUGINS)
+if(NOT IXRAY_COMPRESSOR_ONLY)
     if(IXRAY_UTILS OR IXRAY_EDITORS)
         add_subdirectory("MagicSoftware/FreeMagic/Source")
+		add_subdirectory("NvMender2003")
+
+		set_target_properties(NvMender2003 PROPERTIES ${IXRAY_FOLDER_3RD})
         set_target_properties(MagicFM PROPERTIES ${IXRAY_FOLDER_3RD})
     endif()
 endif()
@@ -30,7 +33,7 @@ if(DEVIXRAY_ENABLE_OGL_RENDER AND NOT IXRAY_COMPRESSOR_ONLY)
 endif()
 
 # Move 3rd
-if(NOT IXRAY_COMPRESSOR_ONLY AND NOT IXRAY_PLUGINS)
+if(NOT IXRAY_COMPRESSOR_ONLY)
     set_target_properties(luabind PROPERTIES ${IXRAY_FOLDER_3RD})
     set_target_properties(ODE PROPERTIES ${IXRAY_FOLDER_3RD})
     set_target_properties(crypto PROPERTIES ${IXRAY_FOLDER_3RD})

diff --git a/src/3rd party/NvMender2003/CMakeLists.txt b/src/3rd party/NvMender2003/CMakeLists.txt
@@ -0,0 +1,11 @@
+file(GLOB NvMender2003_SRC CONFIGURE_DEPENDS
+	"*.cpp"
+	"*.h"
+)
+
+add_library(NvMender2003 STATIC ${NvMender2003_SRC})
+target_compile_options(NvMender2003 PRIVATE "/wd4005")
+
+target_include_directories(NvMender2003 PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
+target_include_directories(NvMender2003 PUBLIC "${CMAKE_BINARY_DIR}/packages/Microsoft.DXSDK.D3DX.9.29.952.8/build/native/include/")
+target_link_libraries(NvMender2003 PUBLIC xrCore)