Merge pull request #144 from MaddTheSane/machBundle

DescentDevelopers · May 4, 2024 · bea6bec · bea6bec
2 parents 84304cf + c534c1b
commit bea6bec
Show file tree

Hide file tree

Showing 11 changed files with 14 additions and 11 deletions.
diff --git a/netcon/lanclient/CMakeLists.txt b/netcon/lanclient/CMakeLists.txt
@@ -3,7 +3,7 @@ set(CPPS lanclient.cpp)
 
 set(NETGAME_MODULE "TCP_IP")
 
-add_library(${NETGAME_MODULE} SHARED ${CPPS} ${HEADERS})
+add_library(${NETGAME_MODULE} MODULE ${CPPS} ${HEADERS})
 set_target_properties(${NETGAME_MODULE} PROPERTIES PREFIX "")
 set_target_properties(${NETGAME_MODULE} PROPERTIES SUFFIX ".d3c")
 target_link_libraries(${NETGAME_MODULE} inetfile)
diff --git a/netgames/anarchy/CMakeLists.txt b/netgames/anarchy/CMakeLists.txt
@@ -3,7 +3,7 @@ set(CPPS anarchy.cpp)
 
 set(NETGAME_MODULE anarchy)
 
-add_library(${NETGAME_MODULE} SHARED ${CPPS} ${HEADERS})
+add_library(${NETGAME_MODULE} MODULE ${CPPS} ${HEADERS})
 set_target_properties(${NETGAME_MODULE} PROPERTIES PREFIX "")
 set_target_properties(${NETGAME_MODULE} PROPERTIES SUFFIX ".d3m")
 

diff --git a/netgames/coop/CMakeLists.txt b/netgames/coop/CMakeLists.txt
@@ -3,7 +3,7 @@ set(CPPS coop.cpp)
 
 set(NETGAME_MODULE coop)
 
-add_library(${NETGAME_MODULE} SHARED ${CPPS} ${HEADERS})
+add_library(${NETGAME_MODULE} MODULE ${CPPS} ${HEADERS})
 set_target_properties(${NETGAME_MODULE} PROPERTIES PREFIX "")
 set_target_properties(${NETGAME_MODULE} PROPERTIES SUFFIX ".d3m")
 

diff --git a/netgames/ctf/CMakeLists.txt b/netgames/ctf/CMakeLists.txt
@@ -3,7 +3,7 @@ set(CPPS ctf.cpp)
 
 set(NETGAME_MODULE ctf)
 
-add_library(${NETGAME_MODULE} SHARED ${CPPS} ${HEADERS})
+add_library(${NETGAME_MODULE} MODULE ${CPPS} ${HEADERS})
 set_target_properties(${NETGAME_MODULE} PROPERTIES PREFIX "")
 set_target_properties(${NETGAME_MODULE} PROPERTIES SUFFIX ".d3m")
 

diff --git a/netgames/entropy/CMakeLists.txt b/netgames/entropy/CMakeLists.txt
@@ -3,7 +3,7 @@ set(CPPS EntropyBase.cpp EntropyPackets.cpp EntropyRoom.cpp)
 
 set(NETGAME_MODULE entropy)
 
-add_library(${NETGAME_MODULE} SHARED ${CPPS} ${HEADERS})
+add_library(${NETGAME_MODULE} MODULE ${CPPS} ${HEADERS})
 set_target_properties(${NETGAME_MODULE} PROPERTIES PREFIX "")
 set_target_properties(${NETGAME_MODULE} PROPERTIES SUFFIX ".d3m")
 

diff --git a/netgames/hoard/CMakeLists.txt b/netgames/hoard/CMakeLists.txt
@@ -3,7 +3,7 @@ set(CPPS hoard.cpp hoard_ui.cpp)
 
 set(NETGAME_MODULE hoard)
 
-add_library(${NETGAME_MODULE} SHARED ${CPPS} ${HEADERS})
+add_library(${NETGAME_MODULE} MODULE ${CPPS} ${HEADERS})
 set_target_properties(${NETGAME_MODULE} PROPERTIES PREFIX "")
 set_target_properties(${NETGAME_MODULE} PROPERTIES SUFFIX ".d3m")
 

diff --git a/netgames/hyperanarchy/CMakeLists.txt b/netgames/hyperanarchy/CMakeLists.txt
@@ -3,7 +3,7 @@ set(CPPS hyperanarchy.cpp)
 
 set(NETGAME_MODULE hyperanarchy)
 
-add_library(${NETGAME_MODULE} SHARED ${CPPS} ${HEADERS})
+add_library(${NETGAME_MODULE} MODULE ${CPPS} ${HEADERS})
 set_target_properties(${NETGAME_MODULE} PROPERTIES PREFIX "")
 set_target_properties(${NETGAME_MODULE} PROPERTIES SUFFIX ".d3m")
 

diff --git a/netgames/monsterball/CMakeLists.txt b/netgames/monsterball/CMakeLists.txt
@@ -3,7 +3,7 @@ set(CPPS monsterball.cpp)
 
 set(NETGAME_MODULE monsterball)
 
-add_library(${NETGAME_MODULE} SHARED ${CPPS} ${HEADERS})
+add_library(${NETGAME_MODULE} MODULE ${CPPS} ${HEADERS})
 set_target_properties(${NETGAME_MODULE} PROPERTIES PREFIX "")
 set_target_properties(${NETGAME_MODULE} PROPERTIES SUFFIX ".d3m")
 

diff --git a/netgames/roboanarchy/CMakeLists.txt b/netgames/roboanarchy/CMakeLists.txt
@@ -3,7 +3,7 @@ set(CPPS roboanarchy.cpp)
 
 set(NETGAME_MODULE roboanarchy)
 
-add_library(${NETGAME_MODULE} SHARED ${CPPS} ${HEADERS})
+add_library(${NETGAME_MODULE} MODULE ${CPPS} ${HEADERS})
 set_target_properties(${NETGAME_MODULE} PROPERTIES PREFIX "")
 set_target_properties(${NETGAME_MODULE} PROPERTIES SUFFIX ".d3m")
 

diff --git a/netgames/tanarchy/CMakeLists.txt b/netgames/tanarchy/CMakeLists.txt
@@ -3,7 +3,7 @@ set(CPPS tanarchy.cpp)
 
 set(NETGAME_MODULE tanarchy)
 
-add_library(${NETGAME_MODULE} SHARED ${CPPS} ${HEADERS})
+add_library(${NETGAME_MODULE} MODULE ${CPPS} ${HEADERS})
 set_target_properties(${NETGAME_MODULE} PROPERTIES PREFIX "")
 set_target_properties(${NETGAME_MODULE} PROPERTIES SUFFIX ".d3m")
 

diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt
@@ -73,10 +73,13 @@ add_custom_target(HogFull-copy
 #)
 
 foreach(SCRIPT ${SCRIPTS})
-  add_library(${SCRIPT} SHARED ${CPPS} "${SCRIPT}.cpp")
+  add_library(${SCRIPT} MODULE ${CPPS} "${SCRIPT}.cpp")
   target_link_libraries(${SCRIPT} fix)
   add_dependencies(${SCRIPT} HogFull-copy) #  HogDemo-copy
   set_target_properties(${SCRIPT} PROPERTIES PREFIX "")
+  if (APPLE)
+    set_target_properties(${SCRIPT} PROPERTIES SUFFIX ".dylib")
+  endif ()
   if (UNIX)
     add_custom_command(
       TARGET ${SCRIPT}