Changeset 4266 in orxonox.OLD

Timestamp:

May 22, 2005, 8:02:13 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: subproject builds gui.

Location:

orxonox/trunk/src

Files:

• lib/gui/gui/Makefile.am (modified) (2 diffs)
• lib/gui/gui/Makefile.in (modified) (1 diff)
• subprojects/Makefile.am (modified) (1 diff)
• subprojects/Makefile.in (modified) (1 diff)
• subprojects/gui/Makefile.am (modified) (2 diffs)
• subprojects/gui/gui_main.cc (moved) (moved from orxonox/trunk/src/lib/gui/gui/gui_main.cc)
• subprojects/importer/Makefile.am (modified) (1 diff)

orxonox/trunk/src/lib/gui/gui/Makefile.am

@@ -24 +24 @@
 
 noinst_LIBRARIES = libORXgui.a 
+
 libORXgui_a_CPPFLAGS=$(GTK2_CFLAGS) $(GTHREAD_CFLAGS) $(CURL_CFLAGS) $(MSBITFIELDS)
 
@@ -51 +52 @@
              banner.xpm \
              logo.xpm
-
-#bin_PROGRAMS=gui
-#gui_SOURCES=gui_main.cc \
-#           gui.cc \
-#           gui_gtk.cc \
-#           gui_element.cc \
-#           gui_video.cc \
-#           gui_audio.cc \
-#           gui_exec.cc \
-#           gui_flags.cc \
-#           gui_banner.cc \
-#           gui_keys.cc \
-#           gui_update.cc \
-#                 $(MAINSRCDIR)/lib/graphics/graphics_engine.cc \
-#                 $(MAINSRCDIR)/lib/lang/base_object.cc \
-#                 $(MAINSRCDIR)/lib/math/vector.cc \
-#                 $(MAINSRCDIR)/util/resource_manager.cc \
-#                 $(MAINSRCDIR)/lib/graphics/text_engine.cc \
-#                 $(MAINSRCDIR)/lib/coord/p_node.cc \
-#                 $(MAINSRCDIR)/lib/coord/null_parent.cc \
-#                 $(MAINSRCDIR)/lib/graphics/importer/array.cc \
-#                 $(MAINSRCDIR)/lib/graphics/importer/model.cc \
-#                 $(MAINSRCDIR)/lib/graphics/importer/objModel.cc \
-#                 $(MAINSRCDIR)/lib/graphics/importer/material.cc \
-#                 $(MAINSRCDIR)/lib/graphics/importer/texture.cc \
-#                 $(MAINSRCDIR)/lib/graphics/importer/primitive_model.cc 
-#

orxonox/trunk/src/lib/gui/gui/Makefile.in

@@ -625 +625 @@
         uninstall-am uninstall-info-am
 
-
-#bin_PROGRAMS=gui
-#gui_SOURCES=gui_main.cc \
-#           gui.cc \
-#           gui_gtk.cc \
-#           gui_element.cc \
-#           gui_video.cc \
-#           gui_audio.cc \
-#           gui_exec.cc \
-#           gui_flags.cc \
-#           gui_banner.cc \
-#           gui_keys.cc \
-#           gui_update.cc \
-#                 $(MAINSRCDIR)/lib/graphics/graphics_engine.cc \
-#                 $(MAINSRCDIR)/lib/lang/base_object.cc \
-#                 $(MAINSRCDIR)/lib/math/vector.cc \
-#                 $(MAINSRCDIR)/util/resource_manager.cc \
-#                 $(MAINSRCDIR)/lib/graphics/text_engine.cc \
-#                 $(MAINSRCDIR)/lib/coord/p_node.cc \
-#                 $(MAINSRCDIR)/lib/coord/null_parent.cc \
-#                 $(MAINSRCDIR)/lib/graphics/importer/array.cc \
-#                 $(MAINSRCDIR)/lib/graphics/importer/model.cc \
-#                 $(MAINSRCDIR)/lib/graphics/importer/objModel.cc \
-#                 $(MAINSRCDIR)/lib/graphics/importer/material.cc \
-#                 $(MAINSRCDIR)/lib/graphics/importer/texture.cc \
-#                 $(MAINSRCDIR)/lib/graphics/importer/primitive_model.cc 
-#
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.

orxonox/trunk/src/subprojects/Makefile.am

@@ -1 +1 @@
 SUBDIRS = importer \
+          gui \
           testmain

orxonox/trunk/src/subprojects/Makefile.in

@@ -165 +165 @@
 target_vendor = @target_vendor@
 SUBDIRS = importer \
+          gui \
           testmain
 

orxonox/trunk/src/subprojects/gui/Makefile.am

@@ -4 +4 @@
 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/gaphics
+AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/graphics
 AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/graphics/importer
+AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/graphics/particles
+AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/gui
+AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/gui/gui
 AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/lang
 AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/util
 AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/math
+AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/tinyxml
 AM_CXXFLAGS+=-I$(MAINSRCDIR)/defs
 AM_CXXFLAGS+=-I$(MAINSRCDIR)/font
@@ -15 +20 @@
 AM_CXXFLAGS+=-I$(MAINSRCDIR)/glmenu
 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
 
 AM_LDFLAGS=$(MWINDOWS)
 
-#"-O3 -pedantic -fPIC -ffast-math -I/usr/X11R6/include"
+
+bin_PROGRAMS = gui
+
+gui_DEPENDENCIES = $(MAINSRCDIR)/libORXgui.a
+
+gui_LDADD = $(MAINSRCDIR)/libORXgui.a \
+            $(GTK2_LIBS) $(GTHREAD_LIBS) $(CURL_LIBS)
+
+gui_SOURCES= gui_main.cc \
+             $(MAINSRCDIR)/lib/graphics/graphics_engine.cc \
+             $(MAINSRCDIR)/lib/lang/base_object.cc \
+             $(MAINSRCDIR)/lib/math/vector.cc \
+             $(MAINSRCDIR)/util/resource_manager.cc \
+             $(MAINSRCDIR)/lib/graphics/text_engine.cc \
+             $(MAINSRCDIR)/lib/coord/p_node.cc \
+             $(MAINSRCDIR)/lib/coord/null_parent.cc \
+             $(MAINSRCDIR)/lib/graphics/importer/array.cc \
+             $(MAINSRCDIR)/lib/graphics/importer/model.cc \
+             $(MAINSRCDIR)/lib/graphics/importer/objModel.cc \
+             $(MAINSRCDIR)/lib/graphics/importer/material.cc \
+             $(MAINSRCDIR)/lib/graphics/importer/texture.cc \
+             $(MAINSRCDIR)/lib/graphics/importer/primitive_model.cc 
+
+noinst_HEADERS= 
 
 
-bin_PROGRAMS = gui
-gui_SOURCES= gui
 
-noinst_HEADERS= 
+#bin_PROGRAMS=gui
+#gui_SOURCES=gui_main.cc \
+#           gui.cc \
+#           gui_gtk.cc \
+#           gui_element.cc \
+#           gui_video.cc \
+#           gui_audio.cc \
+#           gui_exec.cc \
+#           gui_flags.cc \
+#           gui_banner.cc \
+#           gui_keys.cc \
+#           gui_update.cc \
+#                 $(MAINSRCDIR)/lib/graphics/graphics_engine.cc \
+#                 $(MAINSRCDIR)/lib/lang/base_object.cc \
+#                 $(MAINSRCDIR)/lib/math/vector.cc \
+#                 $(MAINSRCDIR)/util/resource_manager.cc \
+#                 $(MAINSRCDIR)/lib/graphics/text_engine.cc \
+#                 $(MAINSRCDIR)/lib/coord/p_node.cc \
+#                 $(MAINSRCDIR)/lib/coord/null_parent.cc \
+#                 $(MAINSRCDIR)/lib/graphics/importer/array.cc \
+#                 $(MAINSRCDIR)/lib/graphics/importer/model.cc \
+#                 $(MAINSRCDIR)/lib/graphics/importer/objModel.cc \
+#                 $(MAINSRCDIR)/lib/graphics/importer/material.cc \
+#                 $(MAINSRCDIR)/lib/graphics/importer/texture.cc \
+#                 $(MAINSRCDIR)/lib/graphics/importer/primitive_model.cc 
+#

orxonox/trunk/src/subprojects/importer/Makefile.am

@@ -30 +30 @@
 AM_LDFLAGS=$(MWINDOWS)
 
-#"-O3 -pedantic -fPIC -ffast-math -I/usr/X11R6/include"
 bin_PROGRAMS=importer
+
 
 importer_SOURCES= framework.cc \