Changeset 7552 in orxonox.OLD for branches

Timestamp:

May 6, 2006, 11:38:36 AM (19 years ago)

Author:

bensch

Message:

Subproject compiles and Links again

Location:

branches/network/src

Files:

• lib/BuildLibs.am (modified) (2 diffs)
• subprojects/network/Makefile.am (modified) (1 diff)
• subprojects/network/network_unit_test.cc (modified) (1 diff)

branches/network/src/lib/BuildLibs.am

@@ -9 +9 @@
                 $(LIB_PREFIX)/sound/libORXsound.a \
                 $(LIB_PREFIX)/event/libORXevent.a \
-                $(LIB_PREFIX)/physics/libORXphysics.a \
                 $(LIB_PREFIX)/particles/libORXparticles.a \
                 $(LIB_PREFIX)/collision_detection/libORXcd.a \
@@ -18 +17 @@
                 $(LIB_PREFIX)/parser/cmdline_parser/libCmdLineParser.a \
                 $(LIB_PREFIX)/parser/ini_parser/libIniParser.a \
+                $(LIB_PREFIX)/physics/libORXphysics.a \
                 $(LIB_PREFIX)/shell/libORXshell.a \
                 $(LIB_PREFIX)/math/libORXmath.a \

branches/network/src/subprojects/network/Makefile.am

@@ -1 +1 @@
 MAINSRCDIR=../..
 include $(MAINSRCDIR)/defs/include_paths.am
+
+LIB_PREFIX=$(MAINSRCDIR)/lib
+include $(MAINSRCDIR)/lib/BuildLibs.am
+
 
 bin_PROGRAMS = network
 
 
-network_CPPFLAGS = -DNO_SHELL -DNO_SHELL_COMMAND
+network_CPPFLAGS = 
+#-DNO_SHELL -DNO_SHELL_COMMAND
 
-DEPENDENCIES = \
+network_DEPENDENCIES = \
                 $(MAINSRCDIR)/world_entities/libORXwe.a \
                 $(libORXlibs_a_LIBRARIES_) \
                 $(MAINSRCDIR)/util/libORXutils.a
 
-LDADD = \
+network_LDADD = \
                 $(MAINSRCDIR)/util/libORXutils.a \
                 $(libORXlibs_a_LIBRARIES_) \

branches/network/src/subprojects/network/network_unit_test.cc

@@ -440 +440 @@
 
 
-bool ShellBuffer::addBufferLineStatic(const char* line, ...)
-{
+//bool ShellBuffer::addBufferLineStatic(const char* line, ...)
+//{
   //va_list arguments;
   //vprintf(line, arguments);
-  printf("%s", line);
-}
+  //  printf("%s", line);
+//}