Changeset 283 for code/branches/hud
- Timestamp:
- Nov 27, 2007, 11:19:44 PM (17 years ago)
- Location:
- code/branches/hud
- Files:
-
- 1 added
- 3 deleted
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/hud/CMakeLists.txt
r142 r283 45 45 #Sets the search paths for the linking 46 46 LINK_DIRECTORIES(${OGRE_LIB_DIR} ${OIS_LIB_DIR} ${CEGUI_LIB_DIR} ${CEGUI_OGRE_LIB_DIR}) 47 47 48 #Sets the search path for include files 48 49 #INCLUDE_DIRECTORIES(${OGRE_INCLUDE_DIR} ${OIS_INCLUDE_DIR} ${CEGUI_INCLUDE_DIR} ${CEGUI_OGRE_INCLUDE_DIR} -I/usr/include/enet) 49 INCLUDE_DIRECTORIES(${OGRE_INCLUDE_DIR} ${OIS_INCLUDE_DIR} ${CEGUI_INCLUDE_DIR} ${CEGUI_OGRE_INCLUDE_DIR}) 50 INCLUDE_DIRECTORIES( 51 src 52 ${OGRE_INCLUDE_DIR} ${OIS_INCLUDE_DIR} ${CEGUI_INCLUDE_DIR} ${CEGUI_OGRE_INCLUDE_DIR} 53 ) 50 54 51 55 #add main source dir -
code/branches/hud/src/CMakeLists.txt
r164 r283 2 2 3 3 # create a few variables to simplify life 4 5 SET(SRC_FILES orxonox.cc loader/LevelLoader.cc xml/xmlParser.cc) 6 SET(INC_FILES loader/LevelLoader.h xml/xmlParser.h)4 SET( ORXONOX_SRC 5 orxonox.cc 6 ) 7 7 8 8 #Creates an executable 9 ADD_EXECUTABLE(../bin/main ${SRC_FILES} ${INC_FILES}) 9 ADD_EXECUTABLE(../bin/main ${ORXONOX_SRC} ) 10 11 #add weapon source dir 12 ADD_SUBDIRECTORY(hud) 13 10 14 #Links the executable against OGRE and OIS 11 TARGET_LINK_LIBRARIES(../bin/main ${OGRE_LIBRARIES} ${OIS_LIBRARIES} ${CEGUI_LIBRARIES} ${CEGUI_OGRE_LIBRARIES}) 12 15 TARGET_LINK_LIBRARIES(../bin/main 16 HUD 17 ${OGRE_LIBRARIES} ${OIS_LIBRARIES} ${CEGUI_LIBRARIES} ${CEGUI_OGRE_LIBRARIES} 18 ) -
code/branches/hud/src/orxonox.cc
r164 r283 39 39 #include <iostream> 40 40 41 #include "xml/xmlParser.h" 42 #include "loader/LevelLoader.h" 41 #include "hud/hud_overlay.h" 43 42 44 43 … … 191 190 { 192 191 193 string levelFile = "sp_level_moonstation.oxw";194 loader::LevelLoader* loader = new loader::LevelLoader(levelFile);195 192 } 196 193
Note: See TracChangeset
for help on using the changeset viewer.