Changeset 4160 in orxonox.OLD for orxonox/branches/md2_loader/src/Makefile.am

Timestamp:

May 11, 2005, 12:49:49 AM (19 years ago)

Author:

patrick

Message:

orxonox/branches/md2_loader: merged trunk into md2_loader branche using command: svn merge ../trunk md2_loader -r 4139:HEAD

File:

• orxonox/branches/md2_loader/src/Makefile.am (modified) (2 diffs)

orxonox/branches/md2_loader/src/Makefile.am

@@ -33 +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 \
@@ -179 +179 @@
 
 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 \