Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 9794 in orxonox.OLD


Ignore:
Timestamp:
Sep 23, 2006, 6:39:32 PM (15 years ago)
Author:
bensch
Message:

slight change in the make process

Location:
branches/new_class_id/src
Files:
8 edited

Legend:

Unmodified
Added
Removed
  • branches/new_class_id/src/Makefile.am

    r9760 r9794  
    4242                util/kill_target.cc \
    4343                \
    44                 subprojects/benchmark.cc
     44                subprojects/benchmark.cc \
     45                \
     46                \
     47                lib/util/loading/resource_manager.cc
    4548
    4649noinst_HEADERS = \
  • branches/new_class_id/src/lib/BuildLibs.am

    r9758 r9794  
    1717                $(LIB_PREFIX)/gui/gl/libORXglgui.a \
    1818                \
    19                 $(LIB_PREFIX)/util/libORXlibutil.a \
    20                 \
    2119                $(LIB_PREFIX)/graphics/importer/libORXimporter.a \
    2220                $(LIB_PREFIX)/graphics/importer/libtc.a \
  • branches/new_class_id/src/lib/shell/some_shell_commands.cc

    r9779 r9794  
    5252->completionPlugin(0, CompletorFileSystem());
    5353
    54 #include "loading/resource_manager.h"
    55 SHELL_COMMAND(debug, ResourceManager, debug);
     54#include "loading/new_resource_manager.h"
     55SHELL_COMMAND(debug, NewResourceManager, debug);
     56
     57
    5658#include "loading/load_param_class_description.h"
    5759SHELL_COMMAND_STATIC(printAll, LoadParamClassDescription, &LoadParamClassDescription::printAll)
     
    5961SHELL_COMMAND_STATIC(capture, LoadParamClassDescription, &LoadParamClassDescription::captureDescriptions)
    6062    ->defaultValues(true);
     63
     64#include "loading/game_loader.h"
     65SHELL_COMMAND(quit, GameLoader, stop)
     66    ->describe("quits the game")
     67    ->setAlias("orxoquit");
     68
  • branches/new_class_id/src/lib/util/Makefile.am

    r9790 r9794  
    1515                multi_type.cc \
    1616                \
    17                 loading/resource_manager.cc \
    1817                loading/new_resource_manager.cc \
    1918                loading/resource.cc \
  • branches/new_class_id/src/lib/util/loading/game_loader.cc

    r9727 r9794  
    2222
    2323#include "debug.h"
    24 #include "shell_command.h"
    2524#include "campaign.h"
    2625
     
    3029
    3130ObjectListDefinition(GameLoader);
    32 
    33 
    34 SHELL_COMMAND(quit, GameLoader, stop)
    35 ->describe("quits the game")
    36 ->setAlias("orxoquit");
    37 
    3831
    3932GameLoader* GameLoader::singletonRef = NULL;
  • branches/new_class_id/src/lib/util/loading/new_resource_manager.cc

    r9793 r9794  
    2222#include <assert.h>
    2323
    24 //ObjectListDefinition(NewResourceManager);
     24ObjectListDefinition(NewResourceManager);
    2525
    2626
     
    3434NewResourceManager::NewResourceManager ()
    3535{
    36 //  this->registerObject(this, NewResourceManager::_objectList);
     36  //this->registerObject(this, NewResourceManager::_objectList);
    3737  this->setName("NewResourceManager");
    3838
  • branches/new_class_id/src/lib/util/loading/new_resource_manager.h

    r9791 r9794  
    1212class NewResourceManager : public BaseObject
    1313{
    14 //  ObjectListDeclaration(NewResourceManager);
     14  ObjectListDeclaration(NewResourceManager);
    1515public:
    1616  virtual ~NewResourceManager();
  • branches/new_class_id/src/lib/util/loading/resource.cc

    r9793 r9794  
    134134{
    135135  NewResourceManager::getInstance()->registerType(this);
    136   printf("%s\n", typeName.c_str());
     136  PRINTF(4)("Created ResourceType '%s'\n", typeName.c_str());
    137137}
    138138
Note: See TracChangeset for help on using the changeset viewer.