Changeset 547 for code

Timestamp:

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

Author:

landauf

Message:

compiles with mingw

Location:

code/branches/FICN

Files:

• CMakeLists.txt (modified) (1 diff)
• cmake/FindENet.cmake (modified) (1 diff)
• cmake/FindZLIB.cmake (modified) (1 diff)
• src/orxonox/CMakeLists.txt (modified) (3 diffs)
• src/orxonox/objects/CMakeLists.txt (modified) (1 diff)

code/branches/FICN/CMakeLists.txt

@@ -66 +66 @@
 FIND_PACKAGE(ZLIB)
 
-IF(WIN32)
-  SET(WINDOWS_ENET_DEPENDENCIES "ws2_32;winmm")
-ENDIF(WIN32)
-
 #Sets the search paths for the linking
 LINK_DIRECTORIES(${OGRE_LIB_DIR} ${OIS_LIB_DIR} ${CEGUI_LIB_DIR} ${CEGUI_OGRE_LIB_DIR} ${ENet_LIBRARY} ${Boost_LIBRARY_DIRS} ${Zlib_LIBRARY_DIR} core objects loader network weapon classHierarchy audio)

code/branches/FICN/cmake/FindENet.cmake

@@ -28 +28 @@
     )
 
+IF(WIN32)
+  SET(WINDOWS_ENET_DEPENDENCIES "ws2_32;winmm")
+ENDIF(WIN32)
+SET(ENet_LIBRARY ${ENet_LIBRARY} ${WINDOWS_ENET_DEPENDENCIES})
+
 IF (ENet_INCLUDE_DIR AND ENet_LIBRARY)
     SET(ENET_FOUND TRUE)

code/branches/FICN/cmake/FindZLIB.cmake

@@ -60 +60 @@
   FIND_LIBRARY(ZLIB_LIBRARY
     NAMES zlib
-    PATHS ${Zlib_LIBRARY_DIR}
+    PATHS ${ZLIB_LIBRARY_DIR}
   )
 
-  IF(Zlib_LIBRARY)
+  IF(ZLIB_LIBRARY)
     MESSAGE(STATUS "Zlib was found.")
-  ELSE(Zlib_LIBRARY)
+  ELSE(ZLIB_LIBRARY)
     MESSAGE(FATAL_ERROR "Zlib was NOT found.")
   ENDIF(ZLIB_LIBRARY)

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}
 )