Merge pull request #448 from winterheart/mem-module

Make mem module isolated from project

2dlib/CMakeLists.txt

@@ -12,4 +12,5 @@ set(CPPS
 add_library(2dlib STATIC ${HEADERS} ${CPPS})
 target_link_libraries(2dlib PRIVATE
   cfile
+  mem
 )

CMakeLists.txt

@@ -147,8 +147,6 @@ 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>)
 

bitmap/CMakeLists.txt

@@ -15,6 +15,7 @@ target_link_libraries(bitmap PRIVATE
   cfile
   ddebug
   ddio
+  mem
   stb
 )
 target_include_directories(bitmap PUBLIC

cfile/CMakeLists.txt

@@ -7,6 +7,7 @@ set(CPPS
 add_library(cfile STATIC ${CPPS})
 target_link_libraries(cfile PRIVATE
   ddio
+  mem
 )
 target_include_directories(cfile PUBLIC
   $<BUILD_INTERFACE:

ddebug/CMakeLists.txt

@@ -18,3 +18,6 @@ target_include_directories(ddebug PUBLIC
   >
   PRIVATE ${PROJECT_BINARY_DIR}/lib   # For d3_version.h
 )
+target_link_libraries(ddebug PRIVATE
+  mem
+)

ddio/CMakeLists.txt

@@ -23,8 +23,9 @@ set(CPPS
   >
 )
 add_library(ddio STATIC ${CPPS})
-target_link_libraries(ddio
+target_link_libraries(ddio PRIVATE
   ddebug
+  mem
 )
 target_include_directories(ddio PUBLIC
   $<BUILD_INTERFACE:

grtext/CMakeLists.txt

@@ -7,4 +7,5 @@ set(CPPS
 add_library(grtext STATIC ${HEADERS} ${CPPS})
 target_link_libraries(grtext PRIVATE
   ddio
+  mem
 )

manage/CMakeLists.txt

@@ -25,6 +25,7 @@ add_library(manage STATIC ${HEADERS} ${CPPS})
 target_link_libraries(manage PRIVATE
   cfile
   ddio
+  mem
   sndlib
   stream_audio
 )

mem/CMakeLists.txt

@@ -1,5 +1,13 @@
-set(HEADERS)
 set(CPPS
-  mem.cpp)
+  mem.cpp
+)
 
-add_library(mem STATIC ${HEADERS} ${CPPS})
+add_library(mem STATIC ${CPPS})
+target_compile_definitions(mem PUBLIC
+  $<$<BOOL:${ENABLE_MEM_RTL}>:MEM_USE_RTL>
+)
+target_include_directories(mem PUBLIC
+  $<BUILD_INTERFACE:
+    ${PROJECT_SOURCE_DIR}/mem
+  >
+)

model/CMakeLists.txt

@@ -6,4 +6,5 @@ set(CPPS
 add_library(model STATIC ${HEADERS} ${CPPS})
 target_link_libraries(model PRIVATE
   ddio
+  mem
 )

movie/CMakeLists.txt

@@ -6,4 +6,5 @@ add_library(movie STATIC ${HEADERS} ${CPPS})
 target_link_libraries(movie PRIVATE
   ddio
   libmve
+  mem
 )

music/CMakeLists.txt

@@ -9,6 +9,7 @@ add_library(music STATIC ${HEADERS} ${CPPS})
 target_link_libraries(music
   cfile
   ddio
+  mem
   sndlib
   stream_audio
 )

netcon/inetfile/CMakeLists.txt

@@ -6,3 +6,6 @@ set(CPPS
   inetgetfile.cpp)
 
 add_library(inetfile STATIC ${HEADERS} ${CPPS})
+target_link_libraries(inetfile PRIVATE
+  mem
+)

networking/CMakeLists.txt

@@ -1,14 +1,13 @@
 set(HEADERS)
 set(CPPS
-  networking.cpp)
+  networking.cpp
+  $<$<PLATFORM_ID:Windows>:
+    directplay.cpp
+  >
+)
 
-set(PLATFORMCPPS)
-
-if(WIN32)
-  set(PLATFORMCPPS "directplay.cpp")
-endif()
-
-add_library(networking STATIC ${HEADERS} ${CPPS} ${PLATFORMCPPS})
+add_library(networking STATIC ${HEADERS} ${CPPS})
 target_link_libraries(networking PRIVATE
   ddio
+  mem
 )

physics/CMakeLists.txt

@@ -8,5 +8,6 @@ set(CPPS
 add_library(physics STATIC ${HEADERS} ${CPPS})
 target_link_libraries(physics PRIVATE
   ddio
+  mem
   sndlib
 )

renderer/CMakeLists.txt

@@ -27,4 +27,5 @@ add_library(renderer STATIC ${HEADERS} ${CPPS})
 target_link_libraries(renderer PRIVATE
   bitmap
   ddio
+  mem
 )

sndlib/CMakeLists.txt

@@ -21,6 +21,7 @@ add_library(sndlib STATIC ${CPPS})
 target_link_libraries(sndlib PRIVATE
   cfile
   ddio
+  mem
   stream_audio
 )
 target_include_directories(sndlib PUBLIC

stream_audio/CMakeLists.txt

@@ -7,6 +7,7 @@ add_library(stream_audio STATIC ${HEADERS} ${CPPS})
 target_link_libraries(stream_audio PRIVATE
   ddio
   libacm
+  mem
   sndlib
 )
 target_include_directories(stream_audio PUBLIC

ui/CMakeLists.txt

@@ -19,4 +19,5 @@ set(CPPS
 add_library(ui STATIC ${HEADERS} ${CPPS})
 target_link_libraries(ui PRIVATE
   ddio
+  mem
 )