Changeset 547 for code/branches/FICN/src/orxonox

Timestamp:

Dec 17, 2007, 12:16:02 AM (17 years ago)

Author:

landauf

Message:

compiles with mingw

Location:

code/branches/FICN/src/orxonox

Files:

• CMakeLists.txt (modified) (3 diffs)
• objects/CMakeLists.txt (modified) (1 diff)

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

@@ -3 +3 @@
 ADD_SUBDIRECTORY(core)
 ADD_SUBDIRECTORY(hud)
-ADD_SUBDIRECTORY(objects)
+IF(NOT WIN32)
+  ADD_SUBDIRECTORY(objects)
+ENDIF(NOT WIN32)
 ADD_SUBDIRECTORY(weapon)
 ADD_SUBDIRECTORY(particle)
@@ -19 +21 @@
 )
 
-ADD_LIBRARY(orxonox SHARED ${ORXONOX_SRC_FILES})
+IF(WIN32)
+  SET( OBJECTS_SRC_FILES
+    objects/BaseObject.cc
+    objects/WorldEntity.cc
+    objects/test1.cc
+    objects/test2.cc
+    objects/test3.cc
+    objects/Ambient.cc
+    objects/Skybox.cc
+    objects/SceneNode.cc
+    objects/Entity.cc
+    objects/Camera.cc
+    objects/SpaceshipSteeringObject.cc
+  )
+ELSE(WIN32)
+  SET(LINK_OBJECTS_LIBRARY objects)
+ENDIF(WIN32)
 
-ADD_EXECUTABLE(../../bin/main ${ORXONOX_SRC_FILES})
+ADD_LIBRARY(orxonox ${ORXONOX_SRC_FILES})
+
+ADD_EXECUTABLE(../../bin/main ${ORXONOX_SRC_FILES} ${OBJECTS_SRC_FILES})
 
 SET_TARGET_PROPERTIES(../../bin/main PROPERTIES LINK_FLAGS "--no-undefined" )
@@ -33 +53 @@
   core
   hud
-  objects
+  ${LINK_OBJECTS_LIBRARY}
   weapon
   xml

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

@@ -20 +20 @@
   xml
   orxonox
-  ${WINDOWS_ENET_DEPENDENCIES}
 )