Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 2129


Ignore:
Timestamp:
Nov 4, 2008, 1:37:37 PM (16 years ago)
Author:
rgrieder
Message:

Applied changes from HEAD again. I have found a way to solve the problem..

Location:
code/trunk
Files:
2 edited
7 copied

Legend:

Unmodified
Added
Removed
  • code/trunk/src/CMakeLists.txt

    r2127 r2129  
    2727ENDIF (WIN32)
    2828
     29# Include macro to easily add source files in subdirectories
     30INCLUDE(AddSourceFiles)
    2931
    3032# Our own libraries
  • code/trunk/src/orxonox/CMakeLists.txt

    r2127 r2129  
    55  Main.cc
    66  Settings.cc
    7 
    8   gamestates/GSClient.cc
    9   gamestates/GSDedicated.cc
    10   gamestates/GSGraphics.cc
    11   gamestates/GSGUI.cc
    12   gamestates/GSIOConsole.cc
    13   gamestates/GSLevel.cc
    14   gamestates/GSRoot.cc
    15   gamestates/GSServer.cc
    16   gamestates/GSStandalone.cc
    17 
    18   gui/GUIManager.cc
    19   gui/OgreCEGUIRenderer.cpp
    20   gui/OgreCEGUIResourceProvider.cpp
    21   gui/OgreCEGUITexture.cpp
    22 
    23   overlays/OrxonoxOverlay.cc
    24   overlays/OverlayGroup.cc
    25   overlays/OverlayText.cc
    26 
    27   overlays/console/InGameConsole.cc
    28 
    29   overlays/debug/DebugFPSText.cc
    30   overlays/debug/DebugRTRText.cc
    31 
    32   overlays/hud/HUDBar.cc
    33   overlays/hud/HUDNavigation.cc
    34   overlays/hud/HUDRadar.cc
    35   overlays/hud/HUDSpeedBar.cc
    36   overlays/hud/ChatOverlay.cc
    37 
    38   tools/BillboardSet.cc
    39   tools/Mesh.cc
    40   tools/ParticleInterface.cc
    41   tools/TextureGenerator.cc
    42   tools/Timer.cc
    43   tools/WindowEventListener.cc
    44 
    45   objects/EventListener.cc
    46   objects/EventDispatcher.cc
    47   objects/EventTarget.cc
    48   objects/Radar.cc
    49   objects/RadarListener.cc
    50   objects/RadarViewable.cc
    51   objects/Tickable.cc
    52   objects/Test.cc
    53   objects/Script.cc
    54 
    55   objects/Scene.cc
    56   objects/worldentities/WorldEntity.cc
    57   objects/worldentities/PositionableEntity.cc
    58   objects/worldentities/MovableEntity.cc
    59   objects/worldentities/ControllableEntity.cc
    60   objects/worldentities/Model.cc
    61   objects/worldentities/Billboard.cc
    62   objects/worldentities/BlinkingBillboard.cc
    63   objects/worldentities/Light.cc
    64   objects/worldentities/Camera.cc
    65   objects/worldentities/CameraPosition.cc
    66   objects/worldentities/SpawnPoint.cc
    67   objects/worldentities/ParticleEmitter.cc
    68   objects/worldentities/ParticleSpawner.cc
    69 #  objects/worldentities/Backlight.cc
    70 
    71   objects/quest/AddQuest.cc
    72   objects/quest/AddQuestHint.cc
    73   objects/quest/AddReward.cc
    74   objects/quest/ChangeQuestStatus.cc
    75   objects/quest/CompleteQuest.cc
    76   objects/quest/FailQuest.cc
    77   objects/quest/GlobalQuest.cc
    78   objects/quest/LocalQuest.cc
    79   objects/quest/Quest.cc
    80   objects/quest/QuestDescription.cc
    81   objects/quest/QuestEffect.cc
    82   objects/quest/QuestHint.cc
    83   objects/quest/QuestItem.cc
    84   objects/quest/QuestManager.cc
    85   objects/quest/Rewardable.cc
    86 
    87   objects/weaponSystem/WeaponSystem.cc
    88   objects/weaponSystem/WeaponSet.cc
    89   objects/weaponSystem/WeaponSlot.cc
    90   objects/weaponSystem/Weapon.cc
    91   objects/weaponSystem/Munition.cc
    92 
    93   objects/worldentities/triggers/Trigger.cc
    94   objects/worldentities/triggers/DistanceTrigger.cc
    95   objects/worldentities/triggers/EventTrigger.cc
    96 
    97   objects/worldentities/pawns/Spectator.cc
    98   objects/worldentities/pawns/Pawn.cc
    99   objects/worldentities/pawns/SpaceShip.cc
    100 
    101   objects/controllers/Controller.cc
    102   objects/controllers/HumanController.cc
    103 
    104   objects/infos/Info.cc
    105   objects/infos/Level.cc
    106   objects/infos/PlayerInfo.cc
    107   objects/infos/HumanPlayer.cc
    108 
    109   objects/gametypes/Gametype.cc
    110 
     7 
    1118  tolua/tolua_bind.cc
    1129)
     10
     11ADD_SOURCE_FILES(gamestates ORXONOX_GAMESTATES_SRC_FILES ORXONOX_SRC_FILES)
     12ADD_SOURCE_FILES(gui        ORXONOX_GUI_SRC_FILES        ORXONOX_SRC_FILES)
     13ADD_SOURCE_FILES(objects    ORXONOX_OBJECTS_SRC_FILES    ORXONOX_SRC_FILES)
     14ADD_SOURCE_FILES(overlays   ORXONOX_OVERLAYS_SRC_FILES   ORXONOX_SRC_FILES)
     15ADD_SOURCE_FILES(tools      ORXONOX_TOOLS_SRC_FILES      ORXONOX_SRC_FILES)
    11316
    11417GET_TARGET_PROPERTY(TOLUA_EXE tolua_orxonox LOCATION)
Note: See TracChangeset for help on using the changeset viewer.