Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 757 for code/branches


Ignore:
Timestamp:
Dec 31, 2007, 2:13:43 PM (17 years ago)
Author:
rgrieder
Message:
  • complete restructured all the CMLs, tried to avoid circular dependencies
Location:
code/branches/FICN_test
Files:
6 deleted
10 edited

Legend:

Unmodified
Added
Removed

  • code/branches/FICN_test/CMakeLists.txt

    r735 r757  
    11PROJECT(Orxonox)
    22#set some global variables, which are used throughout the project
     3SET( Orxonox_BINARY_DIR ${Orxonox_SOURCE_DIR}/bin)
     4SET( Orxonox_SOURCE_DIR ${Orxonox_SOURCE_DIR}/src)
    35
    46OPTION(TESTING_ENABLED "Do you want to enable Testing")
    … …  
    7577INCLUDE_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})
    7678
     79#Set the execution directory
     80
    7781#add main source dir
    7882ADD_SUBDIRECTORY(src)

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

    r742 r757  
    1 PROJECT(Orxonox)
     1INCLUDE_DIRECTORIES(.)
     2LINK_DIRECTORIES(${Orxonox_BINARY_DIR})
    23
    3 INCLUDE_DIRECTORIES(.)
    4 
     4ADD_SUBDIRECTORY(util)
     5ADD_SUBDIRECTORY(orxonox/core)
     6ADD_SUBDIRECTORY(audio)
     7ADD_SUBDIRECTORY(network)
    58ADD_SUBDIRECTORY(loader)
    6 ADD_SUBDIRECTORY(network)
    79ADD_SUBDIRECTORY(orxonox)
    8 ADD_SUBDIRECTORY(audio)
    9 ADD_SUBDIRECTORY(util)

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

    r728 r757  
    1 PROJECT(Orxonox)
    2 
    3 SET(SRC_FILES
     1SET (SRC_FILES
    42  AudioIncludes.h
    53  AudioManager.cc
    … …  
    97)
    108
     9ADD_LIBRARY(${Orxonox_BINARY_DIR}/audio SHARED ${SRC_FILES})
     10SET_TARGET_PROPERTIES( audio PROPERTIES LINK_FLAGS "--no-undefined" )
    1111
    12 INCLUDE_DIRECTORIES(..)
    13 
    14 IF(WIN32)
    15   ADD_LIBRARY(audio ${SRC_FILES})
    16 ELSE(WIN32)
    17   ADD_LIBRARY(audio SHARED ${SRC_FILES})
    18 ENDIF(WIN32)
    19 
    20 TARGET_LINK_LIBRARIES(
    21   audio
     12TARGET_LINK_LIBRARIES( audio
    2213  ${OPENAL_LIBRARY}
    2314  ${ALUT_LIBRARY}
    2415  ${VORBISFILE_LIBRARY}
    25   ${VORBISENC_LIBRARY}
    26   ${VORBIS_LIBRARY}
    27   ${OGG_LIBRARY}
     16#  ${VORBISENC_LIBRARY}
     17#  ${VORBIS_LIBRARY}
     18#  ${OGG_LIBRARY}
    2819)
    2920

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

    r744 r757  
    1 PROJECT(Orxonox)
    2 
    3 # TODO find a cleaner way to include xmlParser
    41SET( LOADER_SRC_FILES
    52  LevelLoader.cc
    63)
    74
    8 IF(WIN32)
    9   ADD_LIBRARY(loader ${LOADER_SRC_FILES})
    10 ELSE(WIN32)
    11   ADD_LIBRARY(loader SHARED ${LOADER_SRC_FILES})
    12 ENDIF(WIN32)
     5ADD_LIBRARY(${Orxonox_BINARY_DIR}/loader SHARED ${LOADER_SRC_FILES})
     6SET_TARGET_PROPERTIES( loader PROPERTIES LINK_FLAGS "--no-undefined" )
    137
    148TARGET_LINK_LIBRARIES( loader

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

    r732 r757  
    1 PROJECT(Orxonox)
    2 
    31SET( NETWORK_SRC_FILES
    42  Client.cc
    … …  
    1715
    1816IF(WIN32)
    19   ADD_LIBRARY(network ${NETWORK_SRC_FILES})
     17  ADD_LIBRARY(${Orxonox_BINARY_DIR}/network ${NETWORK_SRC_FILES})
    2018ELSE(WIN32)
    21   ADD_LIBRARY(network SHARED ${NETWORK_SRC_FILES})
     19  ADD_LIBRARY(${Orxonox_BINARY_DIR}/network SHARED ${NETWORK_SRC_FILES})
    2220ENDIF(WIN32)
     21SET_TARGET_PROPERTIES( network PROPERTIES LINK_FLAGS "--no-undefined" )
    2322
    24 TARGET_LINK_LIBRARIES(network ${ZLIB_LIBRARY} ${ENet_LIBRARY} ${Boost_thread_LIBRARIES})
     23TARGET_LINK_LIBRARIES( network
     24  ${ZLIB_LIBRARY}
     25  ${ENet_LIBRARY}
     26  ${Boost_thread_LIBRARIES}
     27  core
     28)
    2529
    2630# build those parts only on request.

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

    r754 r757  
    1 PROJECT(Orxonox)
    2 
    31ADD_SUBDIRECTORY(core)
    4 ADD_SUBDIRECTORY(hud)
    5 ADD_SUBDIRECTORY(objects)
    6 ADD_SUBDIRECTORY(tools)
    7 ADD_SUBDIRECTORY(particle)
    8 
    9 INCLUDE_DIRECTORIES(tools)
    102
    113SET( ORXONOX_SRC_FILES
     4  GraphicsEngine.cc
     5  Main.cc
    126  Orxonox.cc
    137  SpaceshipSteering.cc
    14   Main.cc
    15   GraphicsEngine.cc
     8  hud/Hud.cc
     9  particle/ParticleInterface.cc
     10  tools/BillboardSet.cc
     11  tools/Light.cc
     12  tools/Mesh.cc
     13  objects/Ambient.cc
     14  objects/Camera.cc
     15  objects/Explosion.cc
     16  objects/Fighter.cc
     17  objects/Model.cc
     18  objects/NPC.cc
     19  ojbects/Projectile.cc
     20  objects/Skybox.cc
     21  objects/SpaceShip.cc
     22# objects/SpaceshipSteeringObject.cc
     23# objects/test1.cc
     24# objects/test2.cc
     25# objects/test3.cc
     26  objects/WorldEntity.cc
     27  objects/weapon/AmmunitionDump.cc
     28  objects/weapon/BarrelGun.cc
     29  objects/weapon/BaseWeapon.cc
     30  objects/weapon/Bullet.cc
     31  objects/weapon/BulleManager.cc
     32  objects/weapon/WeaponStation.cc
    1633)
    1734
    18 IF(WIN32)
    19   SET( OBJECTS_SRC_FILES
    20     ${OBJECTS_SRC_FILES}
    21     ${TOOLS_SRC_FILES}
    22   )
    23 ELSE(WIN32)
    24   SET(LINK_OBJECTS_LIBRARY objects)
    25   SET(LINK_TOOLS_LIBRARY tools)
    26 ENDIF(WIN32)
     35ADD_EXECUTABLE(${Orxonox_BINARY_DIR}/main ${ORXONOX_SRC_FILES} )
    2736
    28 IF(WIN32)
    29 #  ADD_LIBRARY(orxonox ${ORXONOX_SRC_FILES})
    30 ELSE(WIN32)
    31   ADD_LIBRARY(orxonox SHARED ${ORXONOX_SRC_FILES})
    32 ENDIF(WIN32)
     37SET_TARGET_PROPERTIES( main PROPERTIES LINK_FLAGS "--no-undefined" )
    3338
    34 ADD_EXECUTABLE(../../bin/main ${ORXONOX_SRC_FILES} ${OBJECTS_SRC_FILES})
    35 
    36 SET_TARGET_PROPERTIES(../../bin/main PROPERTIES LINK_FLAGS "--no-undefined" )
    37 
    38 TARGET_LINK_LIBRARIES( ../../bin/main
     39TARGET_LINK_LIBRARIES( main
    3940  ${OGRE_LIBRARIES}
    4041  ${OIS_LIBRARIES}
    41   loader
     42  util
     43  core
    4244  audio
    4345  network
    44   core
    45   hud
    46   ${LINK_OBJECTS_LIBRARY}
    47   ${LINK_TOOLS_LIBRARY}
    48   util
    49   particle
     46  loader
    5047)
    5148

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

    r733 r757  
    1 PROJECT(Orxonox)
    2 
    31SET( CORE_SRC_FILES
    42  BaseObject.cc
    … …  
    1715)
    1816
    19 IF(WIN32)
    20   ADD_LIBRARY(core SHARED ${CORE_SRC_FILES})
    21 ELSE(WIN32)
    22   ADD_LIBRARY(core SHARED ${CORE_SRC_FILES})
    23 ENDIF(WIN32)
     17ADD_LIBRARY(${Orxonox_BINARY_DIR}/core SHARED ${CORE_SRC_FILES})
     18SET_TARGET_PROPERTIES( core PROPERTIES LINK_FLAGS "--no-undefined" )
     19
     20TARGET_LINK_LIBRARIES( core
     21  util
     22)

  • code/branches/FICN_test/src/orxonox/objects/test2.h

    r734 r757  
    33
    44#include "orxonox/core/BaseObject.h"
    5 #include "Timer.h"
     5#include "../tools/Timer.h"
    66
    77namespace orxonox

  • code/branches/FICN_test/src/util/CMakeLists.txt

    r754 r757  
    11PROJECT(Orxonox)
    22
    3 ADD_SUBDIRECTORY(tinyxml)
     3AUX_SOURCE_DIRECTORY(tinyxml TINYXML_SRC_FILES)
    44
    55SET (UTIL_SRC_FILES
     6  ${TINYXML_SRC_FILES}
    67  substring.cc
    7   ${TINYXML_SRC_FILES}
    88)
    99
    1010IF(WIN32)
    11   ADD_LIBRARY(util ${UTIL_SRC_FILES})
     11  ADD_LIBRARY(util ${UTIL_SRC_FILES} )
    1212ELSE(WIN32)
    13   ADD_LIBRARY(util SHARED ${UTIL_SRC_FILES})
     13  ADD_LIBRARY(util SHARED ${UTIL_SRC_FILES} )
    1414ENDIF(WIN32)
     15SET_TARGET_PROPERTIES( util PROPERTIES LINK_FLAGS "--no-undefined" )
    1516
    1617
    1718IF(TESTING_ENABLED)
    18 ADD_SUBDIRECTORY(testing)
     19  ADD_SUBDIRECTORY(testing)
    1920ENDIF(TESTING_ENABLED)

  • code/branches/FICN_test/visual_studio/benixonox.vcproj

    r756 r757  
    229229                                </File>
    230230                                <File
     231                                        RelativePath="..\src\orxonox\objects\test1.cc"
     232                                        >
     233                                </File>
     234                                <File
     235                                        RelativePath="..\src\orxonox\objects\test2.cc"
     236                                        >
     237                                </File>
     238                                <File
     239                                        RelativePath="..\src\orxonox\objects\test3.cc"
     240                                        >
     241                                </File>
     242                                <File
    231243                                        RelativePath="..\src\orxonox\objects\WorldEntity.cc"
    232244                                        >
    … …  
    363375                                </File>
    364376                                <File
     377                                        RelativePath="..\src\orxonox\objects\Test.h"
     378                                        >
     379                                </File>
     380                                <File
     381                                        RelativePath="..\src\orxonox\objects\test1.h"
     382                                        >
     383                                </File>
     384                                <File
     385                                        RelativePath="..\src\orxonox\objects\test2.h"
     386                                        >
     387                                </File>
     388                                <File
     389                                        RelativePath="..\src\orxonox\objects\test3.h"
     390                                        >
     391                                </File>
     392                                <File
    365393                                        RelativePath="..\src\orxonox\objects\Tickable.h"
    366394                                        >
Note: See TracChangeset for help on using the changeset viewer.