Changeset 3423 in orxonox.OLD for orxonox/trunk/src/gui/Makefile.am

Timestamp:

Feb 27, 2005, 7:11:19 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: merged branches/updater back into the trunk
merged with command: svn merge branches/updater trunk -r 3241:HEAD
resolved conflicts in debug.h in favor of the trunk.

File:

• orxonox/trunk/src/gui/Makefile.am (modified) (3 diffs)

orxonox/trunk/src/gui/Makefile.am

@@ -1 @@
-AM_CXXFLAGS=$(GTK2_CFLAGS) $(MSBITFIELDS)
-#AM_LDFLAGS=$(GTK2_LIBS)
-LIBS=$(GTK2_LIBS)
+AM_CXXFLAGS=$(GTK2_CFLAGS) $(GTHREAD_CFLAGS) $(CURL_CFLAGS) $(MSBITFIELDS)
+#AM_LDFLAGS=$(GTK2_LIBS)   $(GTHREAD_LIBS)
+LIBS=$(GTK2_LIBS) $(GTHREAD_LIBS) $(CURL_LIBS)
 
 bin_PROGRAMS=gui
@@ -11 +11 @@
             orxonox_gui_flags.cc \
             orxonox_gui_banner.cc \
-            orxonox_gui_keys.cc
+            orxonox_gui_keys.cc \
+            orxonox_gui_update.cc
 
 noinst_HEADERS=orxonox_gui.h \
@@ -20 +21 @@
             orxonox_gui_flags.h \
             orxonox_gui_banner.h \
-            orxonox_gui_keys.h
+            orxonox_gui_keys.h \
+            orxonox_gui_update.h
 
 #  uncomment the following if orxonox requires the mathlibrary