Merge pull request #445 from pzychotic/fix-mem-mgmt

Fixed inconsistent use of memory management functions
DescentDevelopers · Jun 19, 2024 · fa3f379 · fa3f379
2 parents 99e8655 + 04122e3
commit fa3f379
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -149,6 +149,8 @@ elseif(CMAKE_SYSTEM_NAME STREQUAL "Windows")
   add_compile_options("/MP")  # so msbuild builds with multiple processes
 endif()
 
+add_compile_definitions($<$<BOOL:${ENABLE_MEM_RTL}>:MEM_USE_RTL>)
+
 add_compile_definitions($<$<CONFIG:Release>:RELEASE>)
 add_compile_definitions($<$<CONFIG:Debug>:_DEBUG>)
 

diff --git a/Descent3/CMakeLists.txt b/Descent3/CMakeLists.txt
@@ -296,9 +296,6 @@ add_executable(Descent3
   WIN32
   ${HEADERS} ${CPPS} ${PLATFORM_CPPS} ${INCS}
 )
-target_compile_definitions(Descent3 PUBLIC
-  $<$<BOOL:${ENABLE_MEM_RTL}>:MEM_USE_RTL>
-)
 target_link_libraries(Descent3
   2dlib AudioEncode bitmap cfile czip d3music dd_video ddebug ddio libmve libacm
   fix grtext manage mem misc model module movie stream_audio