Changeset 555 for code

Timestamp:

Dec 17, 2007, 2:05:20 AM (17 years ago)

Author:

landauf

Message:

WIN32 hack in CLs

Location:

code/branches/FICN/src

Files:

• loader/CMakeLists.txt (modified) (1 diff)
• network/CMakeLists.txt (modified) (1 diff)
• orxonox/CMakeLists.txt (modified) (2 diffs)
• orxonox/core/CMakeLists.txt (modified) (1 diff)
• orxonox/hud/CMakeLists.txt (modified) (1 diff)
• orxonox/objects/CMakeLists.txt (modified) (1 diff)
• orxonox/particle/CMakeLists.txt (modified) (1 diff)
• orxonox/weapon/CMakeLists.txt (modified) (1 diff)
• tinyxml/CMakeLists.txt (modified) (1 diff)

code/branches/FICN/src/loader/CMakeLists.txt

@@ -6 +6 @@
 )
 
-ADD_LIBRARY(loader SHARED ${LOADER_SRC_FILES})
+IF(WIN32)
+  ADD_LIBRARY(loader ${LOADER_SRC_FILES})
+ELSE(WIN32)
+  ADD_LIBRARY(loader SHARED ${LOADER_SRC_FILES})
+ENDIF(WIN32)
 
 TARGET_LINK_LIBRARIES( loader

code/branches/FICN/src/network/CMakeLists.txt

@@ -34 +34 @@
 )
 
-ADD_LIBRARY(network SHARED ${NETWORK_SRC_FILES})
+IF(WIN32)
+  ADD_LIBRARY(network ${NETWORK_SRC_FILES})
+ELSE(WIN32)
+  ADD_LIBRARY(network SHARED ${NETWORK_SRC_FILES})
+ENDIF(WIN32)
+
 TARGET_LINK_LIBRARIES(network ${ZLIB_LIBRARY} ${ENet_LIBRARY} ${Boost_thread_LIBRARIES})
 

code/branches/FICN/src/orxonox/CMakeLists.txt

@@ -34 +34 @@
     objects/Camera.cc
     objects/SpaceshipSteeringObject.cc
+    objects/Model.cc
   )
 ELSE(WIN32)
@@ -39 +40 @@
 ENDIF(WIN32)
 
-ADD_LIBRARY(orxonox SHARED ${ORXONOX_SRC_FILES})
+IF(WIN32)
+  ADD_LIBRARY(orxonox ${ORXONOX_SRC_FILES})
+ELSE(WIN32)
+  ADD_LIBRARY(orxonox SHARED ${ORXONOX_SRC_FILES})
+ENDIF(WIN32)
 
 ADD_EXECUTABLE(../../bin/main ${ORXONOX_SRC_FILES} ${OBJECTS_SRC_FILES})

code/branches/FICN/src/orxonox/core/CMakeLists.txt

@@ -13 +13 @@
 )
 
-ADD_LIBRARY(core SHARED ${CORE_SRC_FILES})
+IF(WIN32)
+  ADD_LIBRARY(core ${CORE_SRC_FILES})
+ELSE(WIN32)
+  ADD_LIBRARY(core SHARED ${CORE_SRC_FILES})
+ENDIF(WIN32)

code/branches/FICN/src/orxonox/hud/CMakeLists.txt

@@ -6 +6 @@
 )
 
-ADD_LIBRARY(hud SHARED ${HUD_SRC_FILES})
+IF(WIN32)
+  ADD_LIBRARY(hud ${HUD_SRC_FILES})
+ELSE(WIN32)
+  ADD_LIBRARY(hud SHARED ${HUD_SRC_FILES})
+ENDIF(WIN32)

code/branches/FICN/src/orxonox/objects/CMakeLists.txt

@@ -13 +13 @@
   Camera.cc
   SpaceshipSteeringObject.cc
+  Model.cc
 )
 

code/branches/FICN/src/orxonox/particle/CMakeLists.txt

@@ -5 +5 @@
 )
 
-ADD_LIBRARY(particle SHARED ${SRC_FILES})
+IF(WIN32)
+  ADD_LIBRARY(particle ${SRC_FILES})
+ELSE(WIN32)
+  ADD_LIBRARY(particle SHARED ${SRC_FILES})
+ENDIF(WIN32)

code/branches/FICN/src/orxonox/weapon/CMakeLists.txt

@@ -10 +10 @@
 )
 
-ADD_LIBRARY(weapon SHARED ${WEAPON_SRC_FILES})
+IF(WIN32)
+  ADD_LIBRARY(weapon ${WEAPON_SRC_FILES})
+ELSE(WIN32)
+  ADD_LIBRARY(weapon SHARED ${WEAPON_SRC_FILES})
+ENDIF(WIN32)

code/branches/FICN/src/tinyxml/CMakeLists.txt

@@ -4 +4 @@
 
 SET (SRC_FILES
-tinystr.cc
-tinyxml.cc
-tinyxmlerror.cc
-tinyxmlparser
+  tinystr.cc
+  tinyxml.cc
+  tinyxmlerror.cc
+  tinyxmlparser
 )
 
-ADD_LIBRARY(xml SHARED ${SRC_FILES})
+IF(WIN32)
+  ADD_LIBRARY(xml ${SRC_FILES})
+ELSE(WIN32)
+  ADD_LIBRARY(xml SHARED ${SRC_FILES})
+ENDIF(WIN32)
+