Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 319


Ignore:
Timestamp:
Nov 28, 2007, 3:10:28 PM (16 years ago)
Author:
nicolasc
Message:

initial merge of steering

Location:
code/branches/merger
Files:
1 added
7 edited
2 copied

Legend:

Unmodified
Added
Removed

  • code/branches/merger/bin/resources.cfg

    r300 r319  
     1// # Resource locations to be added to the 'boostrap' path
     2// # This also contains the minimum you need to use the Ogre example framework
     3// [Bootstrap]
     4// Zip=../Media/packs/OgreCore.zip
     5//
     6// # Resource locations to be added to the default path
     7// [General]
     8// FileSystem=../Media
     9// FileSystem=../Media/fonts
     10// #FileSystem=../Media/materials/programs
     11// FileSystem=../Media/materials/scripts
     12// FileSystem=../Media/materials/textures
     13// FileSystem=../Media/models
     14// FileSystem=../Media/overlay
     15// #FileSystem=../Media/particle
     16// FileSystem=../Media/gui
     17// Zip=../Media/packs/cubemap.zip
     18// #Zip=../Media/packs/cubemapsJS.zip
     19// #Zip=../Media/packs/dragon.zip
     20// #Zip=../Media/packs/fresneldemo.zip
     21// #Zip=../Media/packs/ogretestmap.zip
     22// Zip=../Media/packs/skybox.zip
     23
    124# Resource locations to be added to the 'boostrap' path
    225# This also contains the minimum you need to use the Ogre example framework
    … …  
    831FileSystem=../Media
    932FileSystem=../Media/fonts
    10 #FileSystem=../Media/materials/programs
     33FileSystem=../Media/materials/programs
    1134FileSystem=../Media/materials/scripts
    1235FileSystem=../Media/materials/textures
    1336FileSystem=../Media/models
    14 FileSystem=../Media/overlay
    15 #FileSystem=../Media/particle
     37FileSystem=../Media/overlays
     38FileSystem=../Media/particle
    1639FileSystem=../Media/gui
     40FileSystem=../Media/DeferredShading../Media
    1741Zip=../Media/packs/cubemap.zip
    18 #Zip=../Media/packs/cubemapsJS.zip
    19 #Zip=../Media/packs/dragon.zip
    20 #Zip=../Media/packs/fresneldemo.zip
    21 #Zip=../Media/packs/ogretestmap.zip
     42Zip=../Media/packs/cubemapsJS.zip
     43Zip=../Media/packs/dragon.zip
     44Zip=../Media/packs/fresneldemo.zip
     45Zip=../Media/packs/ogretestmap.zip
    2246Zip=../Media/packs/skybox.zip
     47

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

    r303 r319  
    66ADD_SUBDIRECTORY(class_hierarchy)
    77
     8# =======
     9# PROJECT(Orxonox)
     10#
     11# # create a few variables to simplify life
     12#
     13# SET(SRC_FILES orxonox.cc loader/LevelLoader.cc xml/xmlParser.cc spaceship_steering.cc)
     14# SET(INC_FILES loader/LevelLoader.h xml/xmlParser.h spaceship_steering.h )
     15#
     16# #Creates an executable
     17# ADD_EXECUTABLE(../bin/main ${SRC_FILES} ${INC_FILES})
     18# #Links the executable against OGRE and OIS
     19# TARGET_LINK_LIBRARIES(../bin/main ${OGRE_LIBRARIES} ${OIS_LIBRARIES} ${CEGUI_LIBRARIES} ${CEGUI_OGRE_LIBRARIES})
     20#
     21# >>>>>>> .merge-right.r318

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

    r301 r319  
    33# TODO find a cleaner way to include xmlParser
    44SET(SRC_FILES LevelLoader.cc ../xml/xmlParser.cc)
    5 SET(INC_FILES LevelLoader.h ../xml/xmlParser.h)
     5# SET(INC_FILES LevelLoader.h ../xml/xmlParser.h)
    66
    77INCLUDE_DIRECTORIES(..)

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

    r297 r319  
    22
    33SET(SRC_FILES Client.cc ConnectionManager.cc PacketBuffer.cc PacketGenerator.cc Synchronisable.cc dummyclient2.cc ClientConnection.cc GameStateManager.cc PacketDecoder.cc Server.cc dummyclient.cc dummyserver.cc)
    4 SET(INC_FILES Client.h ClientConnection.h ConnectionManager.h GameStateManager.h PacketBuffer.h PacketManager.h Server.h Synchronisable.h)
    54
    6 ADD_LIBRARY(network ${SRC_FILES} ${INC_FILES})
     5ADD_LIBRARY(network ${SRC_FILES})

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

    r304 r319  
    22
    33SET(SRC_FILES orxonox.cc)
    4 SET(INC_FILES)
    54
    6 ADD_EXECUTABLE(../../bin/main ${SRC_FILES} ${INC_FILES})
     5ADD_EXECUTABLE(../../bin/main ${SRC_FILES})
    76
    87TARGET_LINK_LIBRARIES(../../bin/main ${OGRE_LIBRARIES} ${OIS_LIBRARIES} loader )

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

    r280 r319  
    22
    33SET(SRC_FILES IdentifierList.cc Identifier.cc MetaObjectList.cc Factory.cc OrxonoxClass.cc)
    4 SET(INC_FILES IdentifierIncludes.h Identifier.h Factory.h ClassFactory.h IdentifierList.h ObjectList.h MetaObjectList.h Iterator.h OrxonoxClass.h)
    54
    6 ADD_LIBRARY(core ${SRC_FILES} ${INC_FILES})
     5ADD_LIBRARY(core ${SRC_FILES})

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

    r282 r319  
    22
    33SET(SRC_FILES BaseObject.cc test1.cc test2.cc test3.cc)
    4 SET(INC_FILES BaseObject.h Test.h test1.h test2.h test3.h)
    54
    6 ADD_LIBRARY(objects ${SRC_FILES} ${INC_FILES})
     5ADD_LIBRARY(objects ${SRC_FILES})
Note: See TracChangeset for help on using the changeset viewer.