Changeset 4270 in orxonox.OLD for orxonox/trunk/src

Timestamp:

May 22, 2005, 8:15:36 PM (20 years ago)

Author:

bensch

Message:

orxonox/trunk: libs are included correcly now

Location:

orxonox/trunk/src

Files:

• Makefile.am (modified) (1 diff)
• Makefile.in (modified) (1 diff)

orxonox/trunk/src/Makefile.am

@@ -35 +35 @@
 
 orxonox_DEPENDENCIES = lib/gui/gui/libORXgui.a \
-                       libtinyxml.a
-orxonox_LDADD = libORXgui.a \
-                libtinyxml.a \
+                       lib/tinyxml/libtinyxml.a
+orxonox_LDADD = lib/gui/gui/libORXgui.a \
+                lib/tinyxml/libtinyxml.a \
                 $(GTK2_LIBS) $(GTHREAD_LIBS) $(CURL_LIBS)
 

orxonox/trunk/src/Makefile.in

@@ -251 +251 @@
 AM_CXXFLAGS = -I$(MAINSRCDIR) -I$(MAINSRCDIR)/world_entities -I$(MAINSRCDIR)/story_entities -I$(MAINSRCDIR)/lib -I$(MAINSRCDIR)/lib/coord -I$(MAINSRCDIR)/lib/data -I$(MAINSRCDIR)/lib/graphics -I$(MAINSRCDIR)/lib/graphics/importer -I$(MAINSRCDIR)/lib/graphics/particles -I$(MAINSRCDIR)/lib/gui -I$(MAINSRCDIR)/lib/gui/gui -I$(MAINSRCDIR)/lib/lang -I$(MAINSRCDIR)/lib/util -I$(MAINSRCDIR)/lib/math -I$(MAINSRCDIR)/lib/tinyxml -I$(MAINSRCDIR)/defs -I$(MAINSRCDIR)/font -I$(MAINSRCDIR)/network -I$(MAINSRCDIR)/glmenu -I$(MAINSRCDIR)/ai -I$(MAINSRCDIR)/util -I$(MAINSRCDIR)/util/animation -I$(MAINSRCDIR)/util/common -I$(MAINSRCDIR)/util/loading -I$(MAINSRCDIR)/util/track -I$(MAINSRCDIR)/subprojects
 orxonox_DEPENDENCIES = lib/gui/gui/libORXgui.a \
-                       libtinyxml.a
-
-orxonox_LDADD = libORXgui.a \
-                libtinyxml.a \
+                       lib/tinyxml/libtinyxml.a
+
+orxonox_LDADD = lib/gui/gui/libORXgui.a \
+                lib/tinyxml/libtinyxml.a \
                 $(GTK2_LIBS) $(GTHREAD_LIBS) $(CURL_LIBS)