Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 283


Ignore:
Timestamp:
Nov 27, 2007, 11:19:44 PM (12 years ago)
Author:
rgrieder
Message:
  • removed the loader files due to several compiler errors (not needed in this branch anyway)
  • added a suitable CMake concept for subfolders (in this case just the one)
  • hud not yet implemented in orxonox.cc (however it is in main_reto branch)
Location:
code/branches/hud
Files:
1 added
3 deleted
3 edited

Legend:

Unmodified
Added
Removed
  • code/branches/hud/CMakeLists.txt

    r142 r283  
    4545#Sets the search paths for the linking
    4646LINK_DIRECTORIES(${OGRE_LIB_DIR} ${OIS_LIB_DIR} ${CEGUI_LIB_DIR} ${CEGUI_OGRE_LIB_DIR})
     47
    4748#Sets the search path for include files
    4849#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})
     50INCLUDE_DIRECTORIES(
     51        src
     52        ${OGRE_INCLUDE_DIR} ${OIS_INCLUDE_DIR} ${CEGUI_INCLUDE_DIR} ${CEGUI_OGRE_INCLUDE_DIR}
     53        )
    5054
    5155#add main source dir
  • code/branches/hud/src/CMakeLists.txt

    r164 r283  
    22
    33# 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)
     4SET( ORXONOX_SRC
     5        orxonox.cc
     6)
    77
    88#Creates an executable
    9 ADD_EXECUTABLE(../bin/main ${SRC_FILES} ${INC_FILES})
     9ADD_EXECUTABLE(../bin/main ${ORXONOX_SRC} )
     10
     11#add weapon source dir
     12ADD_SUBDIRECTORY(hud)
     13
    1014#Links the executable against OGRE and OIS
    11 TARGET_LINK_LIBRARIES(../bin/main ${OGRE_LIBRARIES} ${OIS_LIBRARIES} ${CEGUI_LIBRARIES} ${CEGUI_OGRE_LIBRARIES})
    12 
     15TARGET_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  
    3939#include <iostream>
    4040
    41 #include "xml/xmlParser.h"
    42 #include "loader/LevelLoader.h"
     41#include "hud/hud_overlay.h"
    4342
    4443
     
    191190    {
    192191
    193       string levelFile = "sp_level_moonstation.oxw";
    194       loader::LevelLoader* loader = new loader::LevelLoader(levelFile);
    195192    }
    196193   
Note: See TracChangeset for help on using the changeset viewer.