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

Timestamp:

May 11, 2005, 12:49:49 AM (20 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.in (modified) (3 diffs)

orxonox/branches/md2_loader/src/Makefile.in

@@ -93 +93 @@
         tinyxmlparser.$(OBJEXT) benchmark.$(OBJEXT)
 orxonox_OBJECTS = $(am_orxonox_OBJECTS)
+am__DEPENDENCIES_1 =
 DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
@@ -279 +280 @@
 noinst_LIBRARIES = libORXgui.a
 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 \
@@ -425 +426 @@
 
 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 \
                             lib/gui/gui/gui_gtk.cc \