Changeset 4165 in orxonox.OLD for orxonox/branches/heightMap/src/Makefile.am

Timestamp:

May 11, 2005, 2:23:54 PM (19 years ago)

Author:

bensch

Message:

orxonox/branches/heightMap: merged trunk back to the heightMap branche
merged with command:
svn merge trunk/ branches/heightMap/ -r 4122:HEAD

File:

• orxonox/branches/heightMap/src/Makefile.am (modified) (4 diffs)

orxonox/branches/heightMap/src/Makefile.am

@@ -22 +22 @@
 AM_CXXFLAGS+=-I$(MAINSRCDIR)/util/animation
 AM_CXXFLAGS+=-I$(MAINSRCDIR)/util/common
+AM_CXXFLAGS+=-I$(MAINSRCDIR)/subprojects
 
 
@@ -32 +33 @@
 
 orxonox_DEPENDENCIES = libORXgui.a
-orxonox_LDADD = libORXgui.a
+orxonox_LDADD = libORXgui.a $(GTK2_LIBS) $(GTHREAD_LIBS) $(CURL_LIBS)
 orxonox_SOURCES= orxonox.cc \
                  game_loader.cc \
@@ -89 +90 @@
                  lib/xmlparser/tinystr.cc \
                  lib/xmlparser/tinyxmlerror.cc \
-                 lib/xmlparser/tinyxmlparser.cc 
+                 lib/xmlparser/tinyxmlparser.cc \
+                 subprojects/benchmark.cc
 
 
@@ -163 +165 @@
                  lib/gui/gui/gui_banner.h \
                  lib/gui/gui/gui_keys.h \
-                 lib/gui/gui/gui_update.h
+                 lib/gui/gui/gui_update.h \
+                 subprojects/benchmark.h
 
 libORXgui_a_CPPFLAGS=$(GTK2_CFLAGS) $(GTHREAD_CFLAGS) $(CURL_CFLAGS) $(MSBITFIELDS)
-AM_LDFLAGS=$(GTK2_LIBS) $(GTHREAD_LIBS) $(CURL_LIBS)
 
 libORXgui_a_SOURCES = lib/gui/gui/gui.cc \