Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 376 for code/branches/FICN/src


Ignore:
Timestamp:
Dec 3, 2007, 10:14:04 PM (17 years ago)
Author:
rgrieder
Message:
  • removed the linker flags, since —no-undefined has no influence when building shared libraries (sorry Nico for you efforts) —no-allow-shlib-undefined should exist, but doesn't according to the man page, and it also doesn't work anyway.
  • removed linkage of ENet to the main executable as well (not necessary)
Location:
code/branches/FICN/src
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • code/branches/FICN/src/loader/CMakeLists.txt

    r358 r376  
    33# TODO find a cleaner way to include xmlParser
    44SET( LOADER_SRC_FILES
    5         LevelLoader.cc
    6         ../xml/xmlParser.cc
     5  LevelLoader.cc
     6  ../xml/xmlParser.cc
    77)
    88

  • code/branches/FICN/src/network/CMakeLists.txt

    r372 r376  
    22
    33SET( NETWORK_SRC_FILES
    4         Client.cc
    5         ClientConnection.cc
    6         ConnectionManager.cc
    7         GameStateManager.cc
    8         PacketBuffer.cc
    9         PacketDecoder.cc
    10         PacketGenerator.cc
    11         Server.cc
    12         Synchronisable.cc
     4  Client.cc
     5  ClientConnection.cc
     6  ConnectionManager.cc
     7  GameStateManager.cc
     8  PacketBuffer.cc
     9  PacketDecoder.cc
     10  PacketGenerator.cc
     11  Server.cc
     12  Synchronisable.cc
    1313)
    1414
    1515ADD_LIBRARY(network SHARED ${NETWORK_SRC_FILES})
    16 TARGET_LINK_LIBRARIES(network ${ENet_LIBRARY} ${Boost_LIBRARIES})
    17 SET_TARGET_PROPERTIES(network PROPERTIES LINK_FLAGS "--no-undefined")
     16TARGET_LINK_LIBRARIES(network ${ENet_LIBRARY} ${Boost_thread_LIBRARIES})

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

    r373 r376  
    11PROJECT(Orxonox)
    22
     3ADD_SUBDIRECTORY(core)
     4ADD_SUBDIRECTORY(hud)
     5ADD_SUBDIRECTORY(objects)
     6ADD_SUBDIRECTORY(weapon)
     7
     8
    39SET( ORXONOX_SRC_FILES
    4         orxonox.cc
    5         orxonox_scene.cc
    6         orxonox_ship.cc
    7         run_manager.cc
    8         spaceship_steering.cc
     10  orxonox.cc
     11  orxonox_scene.cc
     12  orxonox_ship.cc
     13  run_manager.cc
     14  spaceship_steering.cc
    915  inertial_node.cc
    1016)
    … …  
    1420SET_TARGET_PROPERTIES(../../bin/main PROPERTIES LINK_FLAGS "--no-undefined" )
    1521
    16 
    17 ADD_SUBDIRECTORY(core)
    18 ADD_SUBDIRECTORY(hud)
    19 ADD_SUBDIRECTORY(objects)
    20 ADD_SUBDIRECTORY(weapon)
    21 
    22 
    2322TARGET_LINK_LIBRARIES( ../../bin/main
    24         ${OGRE_LIBRARIES}
    25         ${OIS_LIBRARIES}
    26         ${ENet_LIBRARY}
    27         loader
    28         network
    29         core
    30         hud
    31         objects
    32         weapon
     23  ${OGRE_LIBRARIES}
     24  ${OIS_LIBRARIES}
     25  loader
     26  network
     27  core
     28  hud
     29  objects
     30  weapon
    3331)

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

    r373 r376  
    22
    33SET( CORE_SRC_FILES
    4         Factory.cc
    5         IdentifierList.cc
    6         Identifier.cc
    7         MetaObjectList.cc
    8         OrxonoxClass.cc
     4  Factory.cc
     5  IdentifierList.cc
     6  Identifier.cc
     7  MetaObjectList.cc
     8  OrxonoxClass.cc
    99)
    1010
    1111ADD_LIBRARY(core SHARED ${CORE_SRC_FILES})
    12 SET_TARGET_PROPERTIES(core PROPERTIES LINK_FLAGS "--no-undefined" )

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

    r373 r376  
    22
    33SET( HUD_SRC_FILES
    4         hud_overlay.cc
    5         test_overlay.cc
     4  hud_overlay.cc
     5  test_overlay.cc
    66)
    77
    8 LINK_DIRECTORIES(.)
    9 
    108ADD_LIBRARY(hud SHARED ${HUD_SRC_FILES})
    11 SET_TARGET_PROPERTIES(hud PROPERTIES LINK_FLAGS "--no-undefined" )

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

    r373 r376  
    22
    33SET( OBJECTS_SRC_FILES
    4         BaseObject.cc
    5         test1.cc
    6         test2.cc
    7         test3.cc
     4  BaseObject.cc
     5  test1.cc
     6  test2.cc
     7  test3.cc
    88)
    99
    1010ADD_LIBRARY(objects SHARED ${OBJECTS_SRC_FILES})
    11 SET_TARGET_PROPERTIES(objects PROPERTIES LINK_FLAGS "--no-undefined" )

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

    r373 r376  
    22
    33SET( WEAPON_SRC_FILES
    4         ammunition_dump.cc
    5         barrel_gun.cc
    6         base_weapon.cc
    7         bullet.cc
    8         bullet_manager.cc
    9         weapon_station.cc
     4  ammunition_dump.cc
     5  barrel_gun.cc
     6  base_weapon.cc
     7  bullet.cc
     8  bullet_manager.cc
     9  weapon_station.cc
    1010)
    1111
    1212ADD_LIBRARY(weapon SHARED ${WEAPON_SRC_FILES})
    13 SET_TARGET_PROPERTIES(weapon PROPERTIES LINK_FLAGS "--no-undefined" )
Note: See TracChangeset for help on using the changeset viewer.