Changeset 1070 for code/trunk/src

Timestamp:

Apr 15, 2008, 1:03:09 PM (17 years ago)

Author:

rgrieder

Message:

• moved "—no-undefined" linker flag to root CMLs
• removed library directories for our own libs from root CMLs (might not work)
• removed warning in Hud.cc (float instead of integer)

Location:

code/trunk/src

Files:

• audio/CMakeLists.txt (modified) (1 diff)
• core/CMakeLists.txt (modified) (1 diff)
• network/CMakeLists.txt (modified) (2 diffs)
• orxonox/CMakeLists.txt (modified) (1 diff)
• orxonox/hud/HUD.cc (modified) (1 diff)
• util/CMakeLists.txt (modified) (1 diff)

code/trunk/src/audio/CMakeLists.txt

@@ -9 +9 @@
   ADD_LIBRARY( audio ${AUDIO_SRC_FILES} )
 ELSE (WIN32)
-  ADD_LIBRARY( audio SHARED ${AUDIO_SRC_FILES})
+  ADD_LIBRARY( audio SHARED ${AUDIO_SRC_FILES} )
 ENDIF (WIN32)
-
-SET_TARGET_PROPERTIES( audio PROPERTIES LINK_FLAGS "--no-undefined" )
 
 TARGET_LINK_LIBRARIES( audio

code/trunk/src/core/CMakeLists.txt

@@ -30 +30 @@
 
 ADD_LIBRARY( core SHARED ${CORE_SRC_FILES})
-SET_TARGET_PROPERTIES( core PROPERTIES LINK_FLAGS "--no-undefined" )
 
 TARGET_LINK_LIBRARIES( core

code/trunk/src/network/CMakeLists.txt

@@ -15 +15 @@
 
 IF(WIN32)
-  ADD_LIBRARY( network ${NETWORK_SRC_FILES})
+  ADD_LIBRARY( network ${NETWORK_SRC_FILES} )
 ELSE(WIN32)
-  ADD_LIBRARY( network SHARED ${NETWORK_SRC_FILES})
+  ADD_LIBRARY( network SHARED ${NETWORK_SRC_FILES} )
 ENDIF(WIN32)
-
-SET_TARGET_PROPERTIES( network PROPERTIES LINK_FLAGS "--no-undefined" )
 
 TARGET_LINK_LIBRARIES( network
@@ -28 +26 @@
   core
 )
+
 
 # build those parts only on request.

code/trunk/src/orxonox/CMakeLists.txt

@@ -34 +34 @@
 ADD_EXECUTABLE( orxonox ${ORXONOX_SRC_FILES} )
 
-SET_TARGET_PROPERTIES( orxonox PROPERTIES LINK_FLAGS "--no-undefined" )
-
 TARGET_LINK_LIBRARIES( orxonox
   ${OGRE_LIBRARIES}

code/trunk/src/orxonox/hud/HUD.cc

@@ -50 +50 @@
     setTargetWindowDistance(30);
 
-    setEnergyValue(60.0);
+    setEnergyValue(60);
 
     setShieldLeftTopValue(true);

code/trunk/src/util/CMakeLists.txt

@@ -18 +18 @@
 
 ADD_LIBRARY( util SHARED ${UTIL_SRC_FILES} )
-SET_TARGET_PROPERTIES( util PROPERTIES LINK_FLAGS "--no-undefined" )
 
 IF(TESTING_ENABLED)