Changeset 4194 in orxonox.OLD for orxonox/branches/openAL/src/Makefile.am

Timestamp:

May 16, 2005, 1:33:19 PM (20 years ago)

Author:

bensch

Message:

orxonox/branches/openAL: merged trunk back to openAL
merged with command:

svn merge ../trunk/ openAL/ -r 3920:HEAD

no conflicts at all

Location:

orxonox/branches/openAL

Files:

• . (modified) (1 prop)
• src/Makefile.am (modified) (8 diffs)

orxonox/branches/openAL

@@ -1 @@
-data http://svn.orxonox.ethz.ch/data
+

@@ -1 @@
-data http://svn.orxonox.ethz.ch/data
+

orxonox/branches/openAL/src/Makefile.am

@@ -8 +8 @@
 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
@@ -20 +22 @@
 AM_CXXFLAGS+=-I$(MAINSRCDIR)/util/animation
 AM_CXXFLAGS+=-I$(MAINSRCDIR)/util/common
-
-
-AM_LDFLAGS= $(MWINDOWS)
+AM_CXXFLAGS+=-I$(MAINSRCDIR)/subprojects
+
+
 
 #"-O3 -pedantic -fPIC -ffast-math -I/usr/X11R6/include"
 
 
-bin_PROGRAMS=orxonox
-
+bin_PROGRAMS=orxonox 
+noinst_LIBRARIES = libORXgui.a
+
+orxonox_DEPENDENCIES = libORXgui.a
+orxonox_LDADD = libORXgui.a $(GTK2_LIBS) $(GTHREAD_LIBS) $(CURL_LIBS)
 orxonox_SOURCES= orxonox.cc \
                  game_loader.cc \
@@ -36 +41 @@
                  track_manager.cc \
                  track_node.cc \
+                 factory.cc \
                  util/animation/animation.cc \
                  util/animation/animation3d.cc \
@@ -69 +75 @@
                  lib/graphics/importer/material.cc \
                  lib/graphics/importer/texture.cc \
+                 lib/graphics/particles/particle_engine.cc \
+                 lib/graphics/particles/particle_system.cc \
+                 lib/graphics/particles/particle_emitter.cc \
                  lib/lang/base_entity.cc \
                  lib/lang/base_object.cc \
@@ -76 +85 @@
                  lib/math/vector.cc \
                  lib/math/curve.cc \
-                 glmenu/glmenu_imagescreen.cc 
+                 glmenu/glmenu_imagescreen.cc \
+                 lib/xmlparser/tinyxml.cc \
+                 lib/xmlparser/tinystr.cc \
+                 lib/xmlparser/tinyxmlerror.cc \
+                 lib/xmlparser/tinyxmlparser.cc \
+                 subprojects/benchmark.cc
 
 noinst_HEADERS = orxonox.h \
@@ -119 +133 @@
                  defs/error.h \
                  defs/debug.h \
+                 defs/globals.h \
                  lib/coord/p_node.h \
                  lib/coord/null_parent.h \
@@ -125 +140 @@
                  lib/graphics/light.h \
                  lib/graphics/text_engine.h \
+                 lib/graphics/particles/particle_engine.h \
+                 lib/graphics/particles/particle_system.h \
+                 lib/graphics/particles/particle_emitter.h \
                  lib/data/data_tank.h \
                  lib/lang/base_entity.h \
@@ -134 +152 @@
                  lib/math/vector.h \
                  lib/math/curve.h \
-                 glmenu/glmenu_imagescreen.h 
+                 glmenu/glmenu_imagescreen.h \
+                 lib/gui/gui/gui.h \
+                 lib/gui/gui/gui_gtk.h \
+                 lib/gui/gui/gui_element.h \
+                 lib/gui/gui/gui_video.h \
+                 lib/gui/gui/gui_audio.h \
+                 lib/gui/gui/gui_exec.h \
+                 lib/gui/gui/gui_flags.h \
+                 lib/gui/gui/gui_banner.h \
+                 lib/gui/gui/gui_keys.h \
+                 lib/gui/gui/gui_update.h \
+                 subprojects/benchmark.h
+
+libORXgui_a_CPPFLAGS=$(GTK2_CFLAGS) $(GTHREAD_CFLAGS) $(CURL_CFLAGS) $(MSBITFIELDS)
+
+libORXgui_a_SOURCES = lib/gui/gui/gui.cc \
+                            lib/gui/gui/gui_gtk.cc \
+                            lib/gui/gui/gui_element.cc \
+                            lib/gui/gui/gui_video.cc \
+                            lib/gui/gui/gui_audio.cc \
+                            lib/gui/gui/gui_exec.cc \
+                            lib/gui/gui/gui_flags.cc \
+                            lib/gui/gui/gui_banner.cc \
+                            lib/gui/gui/gui_keys.cc \
+                            lib/gui/gui/gui_update.cc
 
 

@@ -1 @@
-data http://svn.orxonox.ethz.ch/data
+