Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 1070


Ignore:
Timestamp:
Apr 15, 2008, 1:03:09 PM (16 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
Files:
7 edited

Legend:

Unmodified
Added
Removed
  • code/trunk/CMakeLists.txt

    r1021 r1070  
    22#set some global variables, which are used throughout the project
    33SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)
    4 SET(LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin/lib)
     4SET(LIBRARY_OUTPUT_PATH    ${PROJECT_BINARY_DIR}/bin/lib)
    55
    66OPTION(TESTING_ENABLED "Do you want to enable Testing")
     
    5757SET(CMAKE_CXX_FLAGS "$ENV{CXXFLAGS} -O2 -Wall -g -ggdb")
    5858SET(CMAKE_LD_FLAGS "$ENV{LDFLAGS}")
     59SET(CMAKE_EXE_LINKER_FLAGS " --no-undefined")
     60SET(CMAKE_SHARED_LINKER_FLAGS " --no-undefined")
     61#SET(CMAKE_MODULE_LINKER_FLAGS " --no-undefined")
    5962
    6063#This sets where to look for "Find*.cmake" files
     
    7275FIND_PACKAGE(ZLIB)
    7376FIND_PACKAGE(Lua)
    74 #FIND_PACKAGE(ToLua)
    7577
    7678#Sets the search paths for the linking
    77 LINK_DIRECTORIES(${OGRE_LIB_DIR} ${OIS_LIB_DIR} ${CEGUI_LIB_DIR} ${CEGUI_OGRE_LIB_DIR} ${ENet_LIBRARY} ${Boost_LIBRARY_DIRS} ${Zlib_LIBRARY_DIR} ${Lua_LIBRARIES} core objects loader network weapon classHierarchy audio)
     79LINK_DIRECTORIES(
     80  ${OGRE_LIB_DIR}
     81  ${OIS_LIB_DIR}
     82  ${CEGUI_LIB_DIR} ${CEGUI_OGRE_LIB_DIR}
     83  ${ENet_LIBRARY}
     84  ${Boost_LIBRARY_DIRS}
     85  ${Zlib_LIBRARY_DIR}
     86  ${Lua_LIBRARIES}
     87#  core objects loader network weapon classHierarchy audio
     88)
     89
    7890#Sets the search path for include files
    79 INCLUDE_DIRECTORIES(${OGRE_INCLUDE_DIR} ${OIS_INCLUDE_DIR} ${CEGUI_INCLUDE_DIR} ${CEGUI_OGRE_INCLUDE_DIR} ${ENet_INCLUDE_DIR} ${Boost_INCLUDE_DIRS} ${OPENAL_INCLUDE_DIR} ${ALUT_INCLUDE_DIR} ${VORBIS_INCLUDE_DIR} ${OGG_INCLUDE_DIR} ${Lua_INCLUDE_DIR})
     91INCLUDE_DIRECTORIES(
     92  ${OGRE_INCLUDE_DIR}
     93  ${OIS_INCLUDE_DIR}
     94  ${CEGUI_INCLUDE_DIR} ${CEGUI_OGRE_INCLUDE_DIR}
     95  ${ENet_INCLUDE_DIR}
     96  ${Boost_INCLUDE_DIRS}
     97  ${OPENAL_INCLUDE_DIR} ${ALUT_INCLUDE_DIR} ${VORBIS_INCLUDE_DIR} ${OGG_INCLUDE_DIR}
     98  ${Lua_INCLUDE_DIR}
     99)
    80100
    81101#Set the execution directory
  • code/trunk/src/audio/CMakeLists.txt

    r790 r1070  
    99  ADD_LIBRARY( audio ${AUDIO_SRC_FILES} )
    1010ELSE (WIN32)
    11   ADD_LIBRARY( audio SHARED ${AUDIO_SRC_FILES})
     11  ADD_LIBRARY( audio SHARED ${AUDIO_SRC_FILES} )
    1212ENDIF (WIN32)
    13 
    14 SET_TARGET_PROPERTIES( audio PROPERTIES LINK_FLAGS "--no-undefined" )
    1513
    1614TARGET_LINK_LIBRARIES( audio
  • code/trunk/src/core/CMakeLists.txt

    r1052 r1070  
    3030
    3131ADD_LIBRARY( core SHARED ${CORE_SRC_FILES})
    32 SET_TARGET_PROPERTIES( core PROPERTIES LINK_FLAGS "--no-undefined" )
    3332
    3433TARGET_LINK_LIBRARIES( core
  • code/trunk/src/network/CMakeLists.txt

    r790 r1070  
    1515
    1616IF(WIN32)
    17   ADD_LIBRARY( network ${NETWORK_SRC_FILES})
     17  ADD_LIBRARY( network ${NETWORK_SRC_FILES} )
    1818ELSE(WIN32)
    19   ADD_LIBRARY( network SHARED ${NETWORK_SRC_FILES})
     19  ADD_LIBRARY( network SHARED ${NETWORK_SRC_FILES} )
    2020ENDIF(WIN32)
    21 
    22 SET_TARGET_PROPERTIES( network PROPERTIES LINK_FLAGS "--no-undefined" )
    2321
    2422TARGET_LINK_LIBRARIES( network
     
    2826  core
    2927)
     28
    3029
    3130# build those parts only on request.
  • code/trunk/src/orxonox/CMakeLists.txt

    r1059 r1070  
    3434ADD_EXECUTABLE( orxonox ${ORXONOX_SRC_FILES} )
    3535
    36 SET_TARGET_PROPERTIES( orxonox PROPERTIES LINK_FLAGS "--no-undefined" )
    37 
    3836TARGET_LINK_LIBRARIES( orxonox
    3937  ${OGRE_LIBRARIES}
  • code/trunk/src/orxonox/hud/HUD.cc

    r1056 r1070  
    5050    setTargetWindowDistance(30);
    5151
    52     setEnergyValue(60.0);
     52    setEnergyValue(60);
    5353
    5454    setShieldLeftTopValue(true);
  • code/trunk/src/util/CMakeLists.txt

    r1052 r1070  
    1818
    1919ADD_LIBRARY( util SHARED ${UTIL_SRC_FILES} )
    20 SET_TARGET_PROPERTIES( util PROPERTIES LINK_FLAGS "--no-undefined" )
    2120
    2221IF(TESTING_ENABLED)
Note: See TracChangeset for help on using the changeset viewer.