Changeset 7281 in orxonox.OLD for branches/shared_lib
- Timestamp:
- Apr 10, 2006, 6:09:46 PM (19 years ago)
- Location:
- branches/shared_lib/src
- Files:
-
- 4 edited
- 1 moved
Legend:
- Unmodified
- Added
- Removed
-
branches/shared_lib/src/Makefile.am
r7280 r7281 5 5 6 6 LIB_PREFIX=lib 7 include lib/BuildLibs.am 7 include $(LIB_PREFIX)/BuildLibs.am 8 WORLDENTITY_PREFIX=world_entities 9 include $(WORLDENTITY_PREFIX)/world_entity.am 8 10 9 11 #"-O3 -pedantic -fPIC -ffast-math -I/usr/X11R6/include" … … 19 21 util/libORXutils.a \ 20 22 $(LIBLTDL) \ 21 $(libORXlibs_a_LIBRARIES_) 23 $(libORXlibs_a_LIBRARIES_) \ 24 $(WorldEntities_LIBRARIES_) 25 22 26 23 27 orxonox_LDADD = \ … … 25 29 util/libORXutils.a \ 26 30 $(libORXlibs_a_LIBRARIES_) \ 31 $(WorldEntities_LIBRARIES_) \ 27 32 @LIBLTDL@ \ 28 33 @LIBADD_DL@ \ -
branches/shared_lib/src/lib/shell/shell_command.h
r7225 r7281 15 15 16 16 17 18 17 // FORWARD DECLARATION 18 class ShellCommand; 19 19 class ShellCommandClass; 20 20 class ShellCommandAlias; … … 61 61 friend class ShellCommandClass; 62 62 public: 63 static bool execute (const std::string& executionString); 63 ShellCommand(const std::string& commandName, const std::string& className, const Executor& executor); 64 ~ShellCommand(); 65 64 66 65 67 ShellCommand* describe(const std::string& description); … … 68 70 const MultiType& value2 = MT_NULL, const MultiType& value3 = MT_NULL, 69 71 const MultiType& value4 = MT_NULL); 72 73 static bool execute (const std::string& executionString); 70 74 71 75 static ShellCommand* registerCommand(const std::string& commandName, const std::string& className, const Executor& executor); … … 76 80 77 81 protected: 78 ShellCommand(const std::string& commandName, const std::string& className, const Executor& executor);79 ~ShellCommand();80 81 82 static bool isRegistered(const std::string& commandName, const std::string& className); 82 83 static const char* paramToString(long parameter); -
branches/shared_lib/src/orxonox.cc
r7269 r7281 349 349 /// FIXME make this more modular (search for himself for all the libraries 350 350 PRINTF(0)("We are searching for plugins in %s\n", DynamicLoader::getSearchDir()); 351 DynamicLoader::loadDyLib("libORXweapons.la"); 352 DynamicLoader::loadDyLib("libORXprojectiles.la"); 353 DynamicLoader::loadDyLib("libORXpower_ups.la"); 354 355 DynamicLoader::loadDyLib("libORXenvironmentals.la"); 356 357 DynamicLoader::loadDyLib("libORXmisc_entities.la"); 358 359 DynamicLoader::loadDyLib("libORXplayables.la"); 360 DynamicLoader::loadDyLib("libORXnpcs.la"); 361 printf("%s\n", DynamicLoader::getSearchDir()); 351 // DynamicLoader::loadDyLib("libORXweapons.la"); 352 // DynamicLoader::loadDyLib("libORXprojectiles.la"); 353 // DynamicLoader::loadDyLib("libORXpower_ups.la"); 354 // 355 // DynamicLoader::loadDyLib("libORXenvironmentals.la"); 356 // 357 // DynamicLoader::loadDyLib("libORXmisc_entities.la"); 358 // 359 // DynamicLoader::loadDyLib("libORXplayables.la"); 360 // DynamicLoader::loadDyLib("libORXnpcs.la"); 362 361 363 362 // start the collision detection engine -
branches/shared_lib/src/world_entities/Makefile.am
r7276 r7281 41 41 # npcs/npc.cc 42 42 43 AM_LDFLAGS = - module -no-undefined43 AM_LDFLAGS = -no-undefined 44 44 45 45 pkglib_LTLIBRARIES = \ … … 109 109 effects/lightning_bolt.cc 110 110 111 112 EXTRA_DIST = \ 113 world_entity.am 111 114 112 115 noinst_HEADERS = \ -
branches/shared_lib/src/world_entities/world_entity.am
r7280 r7281 1 1 ## THE SUBCLASSES. THESE MUST BE DYNAMICALLY LINKED OR COMPILED IN DIRECTLY 2 WorldEntities_SOURCES_ = \ 3 world_entities/npcs/npc_test1.cc \ 4 world_entities/npcs/npc_test.cc \ 2 WorldEntities_LIBRARIES_ = \ 3 $(WORLDENTITY_PREFIX)/libORXplayables.la \ 4 $(WORLDENTITY_PREFIX)/libORXweapons.la \ 5 $(WORLDENTITY_PREFIX)/libORXprojectiles.la \ 6 $(WORLDENTITY_PREFIX)/libORXpower_ups.la \ 5 7 \ 6 world_entities/environment.cc \ 7 world_entities/skysphere.cc \ 8 world_entities/skybox.cc \ 9 world_entities/terrain.cc \ 10 world_entities/satellite.cc \ 11 world_entities/movie_entity.cc \ 12 world_entities/recorder.cc \ 13 world_entities/character_attributes.cc \ 14 world_entities/test_entity.cc \ 15 world_entities/planet.cc \ 8 $(WORLDENTITY_PREFIX)/libORXenvironmentals.la \ 16 9 \ 17 world_entities/weapons/test_gun.cc \ 18 world_entities/weapons/turret.cc \ 19 world_entities/weapons/aiming_turret.cc \ 20 world_entities/weapons/targeting_turret.cc \ 21 world_entities/weapons/cannon.cc \ 22 world_entities/weapons/hyperblaster.cc \ 23 world_entities/weapons/aim.cc \ 10 $(WORLDENTITY_PREFIX)/libORXnpcs.la \ 24 11 \ 25 world_entities/projectiles/bomb.cc \ 26 world_entities/projectiles/laser.cc \ 27 world_entities/projectiles/test_bullet.cc \ 28 world_entities/projectiles/rocket.cc \ 29 world_entities/projectiles/guided_missile.cc \ 30 world_entities/projectiles/hyperblast.cc \ 31 \ 32 world_entities/power_ups/turret_power_up.cc \ 33 world_entities/power_ups/laser_power_up.cc \ 34 \ 35 world_entities/space_ships/space_ship.cc \ 36 world_entities/space_ships/helicopter.cc \ 37 world_entities/space_ships/hover.cc \ 38 world_entities/space_ships/turbine_hover.cc \ 39 world_entities/creatures/md2_creature.cc \ 40 \ 41 \ 42 world_entities/environments/water.cc \ 43 world_entities/environments/model_entity.cc \ 44 world_entities/environments/building.cc \ 45 \ 46 world_entities/elements/image_entity.cc \ 47 world_entities/elements/text_element.cc \ 48 \ 49 world_entities/effects/lightning_bolt.cc 50 51 12 $(WORLDENTITY_PREFIX)/libORXmisc_entities.la
Note: See TracChangeset
for help on using the changeset viewer.