Changeset 7275 in orxonox.OLD

Timestamp:

Apr 2, 2006, 8:34:49 PM (18 years ago)

Author:

bensch

Message:

compiles and links in windows

Location:

branches/shared_lib

Files:

• configure.ac (modified) (3 diffs)
• src/Makefile.am (modified) (1 diff)
• src/lib/BuildLibs.am (modified) (2 diffs)
• src/lib/Makefile.am (modified) (3 diffs)
• src/lib/util/Makefile.am (copied) (copied from branches/shared_lib/src/lib/network/Makefile.am) (1 diff)

branches/shared_lib/configure.ac

@@ -298 +298 @@
     MSBITFIELDS="-mms-bitfields"
     MWINDOWS="-mwindows"
+    LDFLAGS="$LDFLAGS "
 #--------#
 # MIN-GW #
@@ -392 +393 @@
  Linux="yes"
 
+ LDFLAGS="$LDFLAGS -rdynamic"
 ##CPPFLAGS="-I/usr/include $CPPFLAGS"
 ##LDFLAGS="-L/usr/lib $LDFLAGS"
@@ -637 +639 @@
                  src/lib/Makefile
                  src/lib/math/Makefile
+                 src/lib/util/Makefile
                  src/lib/graphics/Makefile
                  src/lib/graphics/importer/Makefile

branches/shared_lib/src/Makefile.am

@@ -12 +12 @@
 
 orxonox_CPPFLAGS = -DIS_ORXONOX -DPKG_LIBDIR="\"$(pkglibdir)\""
-orxonox_LDFLAGS = --export-dynamic -ldl -rdynamic
+orxonox_LDFLAGS = --export-dynamic
 ##-ldl -rdynamic
 

branches/shared_lib/src/lib/BuildLibs.am

@@ -4 +4 @@
                 $(LIB_PREFIX)/gui/gtk_gui/libORXgui.a \
                 $(LIB_PREFIX)/gui/gl_gui/libORXglgui.a \
-                $(LIB_PREFIX)/graphics/importer/libORXimporter.la \
                 $(LIB_PREFIX)/graphics/libORXgraphics.a \
-                $(LIB_PREFIX)/sound/libORXsound.a \
                 $(LIB_PREFIX)/event/libORXevent.a \
                 $(LIB_PREFIX)/physics/libORXphysics.a \
@@ -18 +16 @@
                 $(LIB_PREFIX)/parser/ini_parser/libIniParser.a \
                 $(LIB_PREFIX)/shell/libORXshell.a \
+                $(LIB_PREFIX)/util/libORXlibutil.a \
+                $(LIB_PREFIX)/sound/libORXsound.a \
+                $(LIB_PREFIX)/graphics/importer/libORXimporter.la \
                 $(LIB_PREFIX)/math/libORXmath.a \
                 $(LIB_PREFIX)/libORXlibs.a

branches/shared_lib/src/lib/Makefile.am

@@ -10 +10 @@
                 coord/p_node.cc \
                 \
-                util/substring.cc \
-                util/color.cc \
-                util/helper_functions.cc \
-                util/multi_type.cc \
-                util/executor/executor.cc \
-                \
-                util/loading/resource_manager.cc \
-                util/loading/resource.cc \
-                util/loading/game_loader.cc \
-                util/loading/load_param.cc \
-                util/loading/load_param_description.cc \
-                util/loading/factory.cc \
-                util/loading/dynamic_loader.cc \
-                util/preferences.cc \
                 \
                 data/data_tank.cc
@@ -33 +19 @@
                 coord/p_node.h \
                 \
-                util/substring.h \
-                util/multi_type.h \
-                util/color.h \
-                util/helper_functions.h \
-                util/executor/executor.h \
-                util/executor/executor_specials.h \
-                util/executor/functor_list.h \
-                util/preferences.h \
-                \
-                util/loading/resource_manager.h \
-                util/loading/resource.h \
-                util/loading/game_loader.h \
-                util/loading/load_param.h \
-                util/loading/load_param_description.h \
-                util/loading/factory.h \
-                util/loading/dynamic_loader.h \
-                \
-                util/count_pointer.h \
-                util/list.h \
-                \
                 \
                 data/data_tank.h
@@ -59 +25 @@
         . \
         math \
+        util \
         graphics \
         sound \

branches/shared_lib/src/lib/util/Makefile.am

@@ -2 +2 @@
 include $(MAINSRCDIR)/defs/include_paths.am
 
-noinst_LIBRARIES = libORXnet.a
+noinst_LIBRARIES = libORXlibutil.a
 
-libORXnet_a_SOURCES = synchronizeable.cc \
-                      network_manager.cc \
-                      shared_network_data.cc \
-                      network_socket.cc \
-                      connection_monitor.cc \
-                      network_stream.cc \
-                      data_stream.cc \
-                      network_protocol.cc \
-                      server_socket.cc \
-                      handshake.cc \
-                      network_game_manager.cc \
-                      converter.cc
+libORXlibutil_a_SOURCES = \
+                substring.cc \
+                color.cc \
+                helper_functions.cc \
+                multi_type.cc \
+                executor/executor.cc \
+                \
+                loading/resource_manager.cc \
+                loading/resource.cc \
+                loading/game_loader.cc \
+                loading/load_param.cc \
+                loading/load_param_description.cc \
+                loading/factory.cc \
+                loading/dynamic_loader.cc \
+                preferences.cc
 
 
 
+noinst_HEADERS = \
+                substring.h \
+                multi_type.h \
+                color.h \
+                helper_functions.h \
+                executor/executor.h \
+                executor/executor_specials.h \
+                executor/functor_list.h \
+                preferences.h \
+                \
+                loading/resource_manager.h \
+                loading/resource.h \
+                loading/game_loader.h \
+                loading/load_param.h \
+                loading/load_param_description.h \
+                loading/factory.h \
+                loading/dynamic_loader.h \
+                \
+                count_pointer.h \
+                list.h
 
-noinst_HEADERS = synchronizeable.h \
-                 network_manager.h \
-                 shared_network_data.h \
-                 network_socket.h \
-                 connection_monitor.h \
-                 network_stream.h \
-                 data_stream.h \
-                 network_protocol.h \
-                 server_socket.h \
-                 handshake.h \
-                 network_game_manager.h \
-                 converter.h \
-                 netdefs.h
-
-