Changeset 8367 in orxonox.OLD

Timestamp:

Jun 14, 2006, 10:49:48 AM (18 years ago)

Author:

bensch

Message:

trunk: libORXlibutil is built

Location:

trunk

Files:

• configure.ac (modified) (3 diffs)
• src/lib/BuildLibs.am (modified) (1 diff)
• src/lib/Makefile.am (modified) (3 diffs)
• src/lib/util/Makefile.am (copied) (copied from trunk/src/lib/event/Makefile.am) (1 diff)

trunk/configure.ac

@@ -575 +575 @@
         AC_PATH_PROG([QT_RCC], [rcc], [no], ["${QT_BIN_DIRECTORY}:${PATH}"])
 
-        AC_SUBST([QT_RCC])      
+        AC_SUBST([QT_RCC])
         AC_SUBST( QT_INCLUDE_DIR )
         AC_SUBST( QT_CFLAGS )
@@ -582 +582 @@
         echo "QT_LIBS                   = $QT_LIBS"
         echo "QT_CFLAGS                 = $QT_CFLAGS"
-        echo "QT_INCLUDE_DIR    = $QT_INCLUDE_DIR"              
+        echo "QT_INCLUDE_DIR    = $QT_INCLUDE_DIR"
 else
         AX_CHECK_QT([${QT_PREFIX}], [QtCore QtCore4],, [http://www.trolltech.com])
@@ -642 +642 @@
                  src/lib/Makefile
                  src/lib/math/Makefile
+                 src/lib/util/Makefile
                  src/lib/graphics/Makefile
                  src/lib/graphics/importer/Makefile

trunk/src/lib/BuildLibs.am

@@ -24 +24 @@
                 $(LIB_PREFIX)/shell/libORXshell.a \
                 $(LIB_PREFIX)/math/libORXmath.a \
+                $(LIB_PREFIX)/util/libORXlibutil.a \
                 $(LIB_PREFIX)/libORXlibs.a

trunk/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/executor/executor_functional.cc \
-                util/executor/executor_lua.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/filesys/file.cc \
-                util/filesys/directory.cc \
-                \
-                util/preferences.cc \
-                util/threading.cc \
-                util/timer.cc \
-                \
                 data/data_tank.cc
 
@@ -41 +18 @@
                 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_functional.h \
-                util/executor/executor_xml.h \
-                util/executor/executor_lua.h \
-                util/executor/functor_list.h \
-                \
-                util/filesys/file.h \
-                util/filesys/directory.h \
-                \
-                util/preferences.h \
-                util/threading.h \
-                util/timer.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
 
@@ -75 +23 @@
         . \
         math \
+        util \
         graphics \
         sound \

trunk/src/lib/util/Makefile.am

@@ -2 +2 @@
 include $(MAINSRCDIR)/defs/include_paths.am
 
-noinst_LIBRARIES = libORXevent.a 
+noinst_LIBRARIES = libORXlibutil.a
 
-libORXevent_a_SOURCES = event_handler.cc \
-                        event_listener.cc \
-                        key_mapper.cc \
-                        key_names.cc
+libORXlibutil_a_SOURCES = \
+                substring.cc \
+                color.cc \
+                helper_functions.cc \
+                multi_type.cc \
+                executor/executor.cc \
+                executor/executor_functional.cc \
+                executor/executor_lua.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 \
+                \
+                filesys/file.cc \
+                filesys/directory.cc \
+                \
+                preferences.cc \
+                threading.cc \
+                timer.cc
 
-
-noinst_HEADERS = event.h \
-                 event_handler.h \
-                 event_listener.h \
-                 key_mapper.h \
-                 key_names.h \
-                 event_def.h
-
+noinst_HEADERS = \
+                substring.h \
+                multi_type.h \
+                color.h \
+                helper_functions.h \
+                executor/executor.h \
+                executor/executor_functional.h \
+                executor/executor_xml.h \
+                executor/executor_lua.h \
+                executor/functor_list.h \
+                \
+                filesys/file.h \
+                filesys/directory.h \
+                \
+                preferences.h \
+                threading.h \
+                timer.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