Changeset 7170 in orxonox.OLD for branches

Timestamp:

Feb 20, 2006, 1:59:53 PM (19 years ago)

Author:

bensch

Message:

dynamic: testing facility

Location:

branches/shared_lib

Files:

• configure.ac (modified) (1 diff)
• src/Makefile.am (modified) (1 diff)
• src/defs/include_paths.am (modified) (1 diff)
• src/orxonox.cc (modified) (1 diff)
• src/world_entities/Makefile.am (modified) (1 diff)

branches/shared_lib/configure.ac

@@ -42 +42 @@
 #########################
 AC_PROG_CXX
+AC_LIBTOOL_DLOPEN
 AC_PROG_LIBTOOL
 AC_HEADER_STDC

branches/shared_lib/src/Makefile.am

@@ -13 +13 @@
 
 orxonox_CPPFLAGS = -DIS_ORXONOX
-orxonox_LDFLAGS =  -rdynamic -ldl
+orxonox_LDFLAGS =
 
 orxonox_DEPENDENCIES = \

branches/shared_lib/src/defs/include_paths.am

@@ -1 @@
-AM_CXXFLAGS=-I$(MAINSRCDIR)
-AM_CXXFLAGS+=-I$(MAINSRCDIR)/world_entities
-AM_CXXFLAGS+=-I$(MAINSRCDIR)/story_entities
-AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib
-AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/coord
-AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/data
-AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/event
-AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/graphics
-AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/graphics/text_engine
-AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/graphics/importer
-AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/graphics/spatial_separation
-AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/graphics/render2D
-AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/particles
-AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/gui/gtk_gui
-AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/gui/gl_gui
-AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/gui/gl_gui/glmenu
-AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/lang
-AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/shell
-AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/util
-AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/math
-AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/network
-AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/tinyxml
-AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/physics
-AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/physics/fields
-AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/collision_detection
-AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/newmat
-AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/sound
-AM_CXXFLAGS+=-I$(MAINSRCDIR)/defs
-AM_CXXFLAGS+=-I$(MAINSRCDIR)/font
-AM_CXXFLAGS+=-I$(MAINSRCDIR)/network
-AM_CXXFLAGS+=-I$(MAINSRCDIR)/ai
-AM_CXXFLAGS+=-I$(MAINSRCDIR)/util
-AM_CXXFLAGS+=-I$(MAINSRCDIR)/util/animation
-AM_CXXFLAGS+=-I$(MAINSRCDIR)/util/common
-AM_CXXFLAGS+=-I$(MAINSRCDIR)/util/loading
-AM_CXXFLAGS+=-I$(MAINSRCDIR)/util/track
-AM_CXXFLAGS+=-I$(MAINSRCDIR)/subprojects
+INCLUDES =  -I$(MAINSRCDIR) \
+            -I$(MAINSRCDIR)/world_entities \
+            -I$(MAINSRCDIR)/story_entities \
+            -I$(MAINSRCDIR)/lib \
+            -I$(MAINSRCDIR)/lib/coord \
+            -I$(MAINSRCDIR)/lib/data \
+            -I$(MAINSRCDIR)/lib/event \
+            -I$(MAINSRCDIR)/lib/graphics \
+            -I$(MAINSRCDIR)/lib/graphics/text_engine \
+            -I$(MAINSRCDIR)/lib/graphics/importer \
+            -I$(MAINSRCDIR)/lib/graphics/spatial_separation \
+            -I$(MAINSRCDIR)/lib/graphics/render2D \
+            -I$(MAINSRCDIR)/lib/particles \
+            -I$(MAINSRCDIR)/lib/gui/gtk_gui \
+            -I$(MAINSRCDIR)/lib/gui/gl_gui \
+            -I$(MAINSRCDIR)/lib/gui/gl_gui/glmenu \
+            -I$(MAINSRCDIR)/lib/lang \
+            -I$(MAINSRCDIR)/lib/shell \
+            -I$(MAINSRCDIR)/lib/util \
+            -I$(MAINSRCDIR)/lib/math \
+            -I$(MAINSRCDIR)/lib/network \
+            -I$(MAINSRCDIR)/lib/tinyxml \
+            -I$(MAINSRCDIR)/lib/physics \
+            -I$(MAINSRCDIR)/lib/physics/fields \
+            -I$(MAINSRCDIR)/lib/collision_detection \
+            -I$(MAINSRCDIR)/lib/newmat \
+            -I$(MAINSRCDIR)/lib/sound \
+            -I$(MAINSRCDIR)/defs \
+            -I$(MAINSRCDIR)/font \
+            -I$(MAINSRCDIR)/network \
+            -I$(MAINSRCDIR)/ai \
+            -I$(MAINSRCDIR)/util \
+            -I$(MAINSRCDIR)/util/animation \
+            -I$(MAINSRCDIR)/util/common \
+            -I$(MAINSRCDIR)/util/loading \
+            -I$(MAINSRCDIR)/util/track \
+            -I$(MAINSRCDIR)/subprojects

branches/shared_lib/src/orxonox.cc

@@ -341 +341 @@
 //     return false;
 //   }
-  DynamicLoader::loadDyLib("./src/world_entities/.libs/libORXground_turret.so");
+  DynamicLoader::loadDyLib("libORXground_turret.so");
 
   // start the collision detection engine

branches/shared_lib/src/world_entities/Makefile.am

@@ -4 +4 @@
 
 noinst_LIBRARIES = libORXwe.a
-#lib_LTLIBRARIES = libORXground_turret.la
-#libORXground_turret_la_SOURCES = npcs/ground_turret.cc
+pkglib_LTLIBRARIES = libORXground_turret.la
+libORXground_turret_la_SOURCES = npcs/ground_turret.cc
 
 ## THESE ARE THE BASE CLASSES OF ALL WORLD_ENTITIES