Changeset 766

Timestamp:

Dec 31, 2007, 4:16:21 PM (16 years ago)

Author:

rgrieder

Message:

• added IF (WIN32) —> STATIC again

Location:

code/branches/FICN_test

Files:

• CMakeLists.txt (modified) (1 diff)
• src/audio/CMakeLists.txt (modified) (2 diffs)
• src/loader/CMakeLists.txt (modified) (1 diff)
• src/network/CMakeLists.txt (modified) (1 diff)

code/branches/FICN_test/CMakeLists.txt

@@ -1 +1 @@
 PROJECT(Orxonox)
 #set some global variables, which are used throughout the project
-#SET( Orxonox_BINARY_DIR ${Orxonox_SOURCE_DIR}/bin)
-#SET( Orxonox_SOURCE_DIR ${Orxonox_SOURCE_DIR}/src)
 SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)
 SET(LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin/lib)

code/branches/FICN_test/src/audio/CMakeLists.txt

@@ -1 @@
-SET (SRC_FILES
+SET ( AUDIO_SRC_FILES
   AudioIncludes.h
   AudioManager.cc
@@ -7 +7 @@
 )
 
-ADD_LIBRARY( audio SHARED ${SRC_FILES})
+IF (WIN32)
+  ADD_LIBRARY( audio ${AUDIO_SRC_FILES } )
+ELSE (WIN32)
+  ADD_LIBRARY( audio SHARED ${AUDIO_SRC_FILES})
+ENDIF (WIN32)
+
 SET_TARGET_PROPERTIES( audio PROPERTIES LINK_FLAGS "--no-undefined" )
 

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

@@ -3 +3 @@
 )
 
-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)
+
 SET_TARGET_PROPERTIES( loader PROPERTIES LINK_FLAGS "--no-undefined" )
 

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

@@ -19 +19 @@
   ADD_LIBRARY( network SHARED ${NETWORK_SRC_FILES})
 ENDIF(WIN32)
+
 SET_TARGET_PROPERTIES( network PROPERTIES LINK_FLAGS "--no-undefined" )