Changeset 7281 in orxonox.OLD

Timestamp:

Apr 10, 2006, 6:09:46 PM (18 years ago)

Author:

bensch

Message:

this really should compile and link (not at runtime) on windows

Location:

branches/shared_lib/src

Files:

• Makefile.am (modified) (3 diffs)
• lib/shell/shell_command.h (modified) (4 diffs)
• orxonox.cc (modified) (1 diff)
• world_entities/Makefile.am (modified) (2 diffs)
• world_entities/world_entity.am (moved) (moved from branches/shared_lib/src/world_entities/WorldEntities.am) (1 diff)

branches/shared_lib/src/Makefile.am

@@ -5 +5 @@
 
 LIB_PREFIX=lib
-include lib/BuildLibs.am
+include $(LIB_PREFIX)/BuildLibs.am
+WORLDENTITY_PREFIX=world_entities
+include $(WORLDENTITY_PREFIX)/world_entity.am
 
 #"-O3 -pedantic -fPIC -ffast-math -I/usr/X11R6/include"
@@ -19 +21 @@
                 util/libORXutils.a \
                 $(LIBLTDL) \
-                $(libORXlibs_a_LIBRARIES_)
+                $(libORXlibs_a_LIBRARIES_) \
+                $(WorldEntities_LIBRARIES_)
+
 
 orxonox_LDADD = \
@@ -25 +29 @@
                 util/libORXutils.a \
                 $(libORXlibs_a_LIBRARIES_) \
+                $(WorldEntities_LIBRARIES_) \
                 @LIBLTDL@ \
                 @LIBADD_DL@ \

branches/shared_lib/src/lib/shell/shell_command.h

@@ -15 +15 @@
 
 
-
 // FORWARD DECLARATION
+class ShellCommand;
 class ShellCommandClass;
 class ShellCommandAlias;
@@ -61 +61 @@
   friend class ShellCommandClass;
   public:
-    static bool execute (const std::string& executionString);
+    ShellCommand(const std::string& commandName, const std::string& className, const Executor& executor);
+    ~ShellCommand();
+
 
     ShellCommand* describe(const std::string& description);
@@ -68 +70 @@
                                 const MultiType& value2 = MT_NULL, const MultiType& value3 = MT_NULL,
                                 const MultiType& value4 = MT_NULL);
+
+    static bool execute (const std::string& executionString);
 
     static ShellCommand* registerCommand(const std::string& commandName, const std::string& className, const Executor& executor);
@@ -76 +80 @@
 
   protected:
-    ShellCommand(const std::string& commandName, const std::string& className, const Executor& executor);
-    ~ShellCommand();
-
     static bool isRegistered(const std::string& commandName, const std::string& className);
     static const char* paramToString(long parameter);

branches/shared_lib/src/orxonox.cc

@@ -349 +349 @@
   /// FIXME make this more modular (search for himself for all the libraries
   PRINTF(0)("We are searching for plugins in %s\n", DynamicLoader::getSearchDir());
-  DynamicLoader::loadDyLib("libORXweapons.la");
-  DynamicLoader::loadDyLib("libORXprojectiles.la");
-  DynamicLoader::loadDyLib("libORXpower_ups.la");
-
-  DynamicLoader::loadDyLib("libORXenvironmentals.la");
-
-  DynamicLoader::loadDyLib("libORXmisc_entities.la");
-
-  DynamicLoader::loadDyLib("libORXplayables.la");
-  DynamicLoader::loadDyLib("libORXnpcs.la");
-  printf("%s\n", DynamicLoader::getSearchDir());
+//   DynamicLoader::loadDyLib("libORXweapons.la");
+//   DynamicLoader::loadDyLib("libORXprojectiles.la");
+//   DynamicLoader::loadDyLib("libORXpower_ups.la");
+//
+//   DynamicLoader::loadDyLib("libORXenvironmentals.la");
+//
+//   DynamicLoader::loadDyLib("libORXmisc_entities.la");
+//
+//   DynamicLoader::loadDyLib("libORXplayables.la");
+//   DynamicLoader::loadDyLib("libORXnpcs.la");
 
   // start the collision detection engine

branches/shared_lib/src/world_entities/Makefile.am

@@ -41 +41 @@
 #               npcs/npc.cc
 
-AM_LDFLAGS = -module -no-undefined
+AM_LDFLAGS = -no-undefined
 
 pkglib_LTLIBRARIES = \
@@ -109 +109 @@
                 effects/lightning_bolt.cc
 
+
+EXTRA_DIST = \
+                world_entity.am
 
 noinst_HEADERS  = \

branches/shared_lib/src/world_entities/world_entity.am

@@ -1 +1 @@
 ## THE SUBCLASSES. THESE MUST BE DYNAMICALLY LINKED OR COMPILED IN DIRECTLY
-WorldEntities_SOURCES_ = \
-                world_entities/npcs/npc_test1.cc \
-                world_entities/npcs/npc_test.cc \
+WorldEntities_LIBRARIES_ = \
+                $(WORLDENTITY_PREFIX)/libORXplayables.la \
+                $(WORLDENTITY_PREFIX)/libORXweapons.la \
+                $(WORLDENTITY_PREFIX)/libORXprojectiles.la \
+                $(WORLDENTITY_PREFIX)/libORXpower_ups.la \
                 \
-                world_entities/environment.cc \
-                world_entities/skysphere.cc \
-                world_entities/skybox.cc \
-                world_entities/terrain.cc \
-                world_entities/satellite.cc \
-                world_entities/movie_entity.cc \
-                world_entities/recorder.cc \
-                world_entities/character_attributes.cc \
-                world_entities/test_entity.cc \
-                world_entities/planet.cc \
+                $(WORLDENTITY_PREFIX)/libORXenvironmentals.la \
                 \
-                world_entities/weapons/test_gun.cc \
-                world_entities/weapons/turret.cc \
-                world_entities/weapons/aiming_turret.cc \
-                world_entities/weapons/targeting_turret.cc \
-                world_entities/weapons/cannon.cc \
-                world_entities/weapons/hyperblaster.cc \
-                world_entities/weapons/aim.cc \
+                $(WORLDENTITY_PREFIX)/libORXnpcs.la \
                 \
-                world_entities/projectiles/bomb.cc \
-                world_entities/projectiles/laser.cc \
-                world_entities/projectiles/test_bullet.cc \
-                world_entities/projectiles/rocket.cc \
-                world_entities/projectiles/guided_missile.cc \
-                world_entities/projectiles/hyperblast.cc \
-                \
-                world_entities/power_ups/turret_power_up.cc \
-                world_entities/power_ups/laser_power_up.cc \
-                \
-                world_entities/space_ships/space_ship.cc \
-                world_entities/space_ships/helicopter.cc \
-                world_entities/space_ships/hover.cc \
-                world_entities/space_ships/turbine_hover.cc \
-                world_entities/creatures/md2_creature.cc \
-                \
-                \
-                world_entities/environments/water.cc \
-                world_entities/environments/model_entity.cc \
-                world_entities/environments/building.cc \
-                \
-                world_entities/elements/image_entity.cc \
-                world_entities/elements/text_element.cc \
-                \
-                world_entities/effects/lightning_bolt.cc
-
-
+                $(WORLDENTITY_PREFIX)/libORXmisc_entities.la