Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 389 for code/branches/FICN/src


Ignore:
Timestamp:
Dec 5, 2007, 2:30:09 PM (17 years ago)
Author:
nicolasc
Message:

merged audio into FICN

Location:
code/branches/FICN/src
Files:
23 added
3 edited
12 copied

Legend:

Unmodified
Added
Removed

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

    r354 r389  
    66ADD_SUBDIRECTORY(network)
    77ADD_SUBDIRECTORY(orxonox)
     8ADD_SUBDIRECTORY(class_hierarchy)
     9ADD_SUBDIRECTORY(audio)
    810
    9 # xml get handled by loader
     11# xml gets handled by loader

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

    r387 r389  
    1515ADD_LIBRARY(audio ${SRC_FILES} ${INC_FILES})
    1616
    17 TARGET_LINK_LIBRARIES(audio ${OPENAL_LIBRARY} ${ALUT_LIBRARY})
     17TARGET_LINK_LIBRARIES(audio ${OPENAL_LIBRARY} ${ALUT_LIBRARY} ${OGGVORBIS_LIBRARY})
    1818
    1919

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

    r376 r389  
    2424  ${OIS_LIBRARIES}
    2525  loader
     26  audio
    2627  network
    2728  core
    … …  
    3031  weapon
    3132)
     33

  • code/branches/FICN/src/orxonox/orxonox.cc

    r379 r389  
    5151#include "xml/xmlParser.h"
    5252#include "loader/LevelLoader.h"
     53#include "audio/AudioManager.h"
    5354
    5455#include "spaceship_steering.h"
    … …  
    280281      void createScene(void)
    281282      {
     283                audio::AudioManager* auMan = new audio::AudioManager();
     284
    282285
    283286      string levelFile = "sp_level_moonstation.oxw";
    284287      loader::LevelLoader* loader = new loader::LevelLoader(levelFile);
    285288    }
     289
    286290
    287291    void setupScene()
Note: See TracChangeset for help on using the changeset viewer.