Changeset 300 for code/branches
- Timestamp:
- Nov 28, 2007, 2:12:56 AM (17 years ago)
- Location:
- code/branches/merger
- Files:
-
- 5 edited
- 122 copied
Legend:
- Unmodified
- Added
- Removed
-
code/branches/merger/CMakeLists.txt
r298 r300 53 53 LINK_DIRECTORIES(${OGRE_LIB_DIR} ${OIS_LIB_DIR} ${CEGUI_LIB_DIR} ${CEGUI_OGRE_LIB_DIR} ${ENet_LIBRARY} ${Boost_LIBRARY_DIRS}) 54 54 #Sets the search path for include files 55 INCLUDE_DIRECTORIES( ${OGRE_INCLUDE_DIR} ${OIS_INCLUDE_DIR} ${CEGUI_INCLUDE_DIR} ${CEGUI_OGRE_INCLUDE_DIR} ${ENet_INCLUDE_DIR} ${Boost_INCLUDE_DIRS})55 INCLUDE_DIRECTORIES(src ${OGRE_INCLUDE_DIR} ${OIS_INCLUDE_DIR} ${CEGUI_INCLUDE_DIR} ${CEGUI_OGRE_INCLUDE_DIR} ${ENet_INCLUDE_DIR} ${Boost_INCLUDE_DIRS}) 56 56 57 57 #add main source dir 58 58 ADD_SUBDIRECTORY(src) 59 59 60 -
code/branches/merger/INSTALL
r148 r300 5 5 ois-1.0 6 6 cegui-0.5.0b 7 enet-1.0 8 9 cmake (used version 2.4.7) 7 enet-1.1 8 boost-1.34.1 9 cmake-2.4.7 10 (all named version were tested. lower version requirement may be possible) 10 11 11 12 -
code/branches/merger/bin/resources.cfg
r135 r300 9 9 FileSystem=../Media/fonts 10 10 #FileSystem=../Media/materials/programs 11 #FileSystem=../Media/materials/scripts12 #FileSystem=../Media/materials/textures13 #FileSystem=../Media/models14 #FileSystem=../Media/overlays 11 FileSystem=../Media/materials/scripts 12 FileSystem=../Media/materials/textures 13 FileSystem=../Media/models 14 FileSystem=../Media/overlay 15 15 #FileSystem=../Media/particle 16 16 FileSystem=../Media/gui 17 #FileSystem=../Media/DeferredShadingMedia 18 #Zip=../Media/packs/cubemap.zip 17 Zip=../Media/packs/cubemap.zip 19 18 #Zip=../Media/packs/cubemapsJS.zip 20 19 #Zip=../Media/packs/dragon.zip -
code/branches/merger/src/CMakeLists.txt
r293 r300 1 1 PROJECT(Orxonox) 2 3 # create a few variables to simplify life4 # SET(SRC_FILES orxonox/orxonox.cc loader/LevelLoader.cc xml/xmlParser.cc orxonox/core/IdentifierList.cc orxonox/core/Identifier.cc orxonox/core/MetaObjectList.cc orxonox/core/Factory.cc orxonox/core/OrxonoxClass.cc orxonox/objects/BaseObject.cc orxonox/objects/test1.cc orxonox/objects/test2.cc orxonox/objects/test3.cc)5 # SET(INC_FILES loader/LevelLoader.h xml/xmlParser.h orxonox/core/IdentifierIncludes.h orxonox/core/Identifier.h orxonox/core/Factory.h orxonox/core/ClassFactory.h orxonox/core/IdentifierList.h orxonox/core/ObjectList.h orxonox/core/MetaObjectList.h orxonox/core/Iterator.h orxonox/core/OrxonoxClass.h orxonox/objects/BaseObject.h orxonox/objects/Test.h orxonox/objects/test1.h orxonox/objects/test2.h orxonox/objects/test3.h)6 7 #Creates an executable8 # ADD_EXECUTABLE(../bin/main ${SRC_FILES} ${INC_FILES})9 #Links the executable against OGRE and OIS10 # TARGET_LINK_LIBRARIES(../bin/main ${OGRE_LIBRARIES} ${OIS_LIBRARIES} ${CEGUI_LIBRARIES} ${CEGUI_OGRE_LIBRARIES})11 2 12 3 ADD_SUBDIRECTORY(orxonox) … … 14 5 ADD_SUBDIRECTORY(network) 15 6 ADD_SUBDIRECTORY(hud) 7 ADD_SUBDIRECTORY(weapon) 8 ADD_SUBDIRECTORY(class_hierarchy) 9 10 11 # create a few variables to simplify life 12 # SET( ORXONOX_SRC 13 # inertial_node.cc 14 # main.cc 15 # ogre_control.cc 16 # orxonox.cc 17 # orxonox_scene.cc 18 # orxonox_ship.cc 19 # run_manager.cc 20 # ) 21 22 #Creates an executable 23 # ADD_EXECUTABLE(../bin/main ${ORXONOX_SRC} ) 24 25 #add weapon source dir 26 27 # ADD_SUBDIRECTORY(hud) 28 29 #Links the executable against OGRE and OIS 30 # TARGET_LINK_LIBRARIES(../bin/main 31 # WEAPON 32 # CLASS_HIERARCHY 33 # HUD 34 # ${OGRE_LIBRARIES} ${OIS_LIBRARIES} ${CEGUI_LIBRARIES} ${CEGUI_OGRE_LIBRARIES} 35 # ) 36 37 #TARGET_LINK_LIBRARIES(../bin/main ${OGRE_LIBRARIES} ${OIS_LIBRARIES} ${CEGUI_LIBRARIES} ${CEGUI_OGRE_LIBRARIES}) 38 -
code/branches/merger/src/hud/hud_overlay.h
r293 r300 33 33 #include "OgrePrerequisites.h" 34 34 35 #include "orxonox_prerequisites.h" 36 35 37 36 38 namespace orxonox {
Note: See TracChangeset
for help on using the changeset viewer.