Changeset 4650 in orxonox.OLD for orxonox/trunk/src/subprojects/particles

Timestamp:

Jun 17, 2005, 11:07:59 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: Now the Subprojects get the DataDirectory from the ~/orxonox/orxonox.conf file

Location:

orxonox/trunk/src/subprojects/particles

Files:

• Makefile.am (modified) (2 diffs)
• Makefile.in (modified) (3 diffs)

orxonox/trunk/src/subprojects/particles/Makefile.am

@@ -8 +8 @@
                   $(MAINSRCDIR)/lib/event/libORXevent.a \
                   $(MAINSRCDIR)/lib/particles/libORXparticles.a \
+                  $(MAINSRCDIR)/lib/sound/libORXsound.a \
                   $(MAINSRCDIR)/lib/graphics/importer/libORXimporter.a \
                   $(MAINSRCDIR)/lib/physics/libORXphysics.a \
@@ -13 +14 @@
                   $(GTK2_LIBS) $(GTHREAD_LIBS) $(CURL_LIBS)
 
-particles_CPPFLAGS =  -DGUI_MODULE  -DNO_AUDIO \
+particles_CPPFLAGS =  -DGUI_MODULE  \
                       $(GTK2_CFLAGS) $(GTHREAD_CFLAGS) $(CURL_CFLAGS) $(MSBITFIELDS)
 

orxonox/trunk/src/subprojects/particles/Makefile.in

@@ -68 +68 @@
         $(MAINSRCDIR)/lib/event/libORXevent.a \
         $(MAINSRCDIR)/lib/particles/libORXparticles.a \
+        $(MAINSRCDIR)/lib/sound/libORXsound.a \
         $(MAINSRCDIR)/lib/graphics/importer/libORXimporter.a \
         $(MAINSRCDIR)/lib/physics/libORXphysics.a \
@@ -216 +217 @@
                   $(MAINSRCDIR)/lib/event/libORXevent.a \
                   $(MAINSRCDIR)/lib/particles/libORXparticles.a \
+                  $(MAINSRCDIR)/lib/sound/libORXsound.a \
                   $(MAINSRCDIR)/lib/graphics/importer/libORXimporter.a \
                   $(MAINSRCDIR)/lib/physics/libORXphysics.a \
@@ -221 +223 @@
                   $(GTK2_LIBS) $(GTHREAD_LIBS) $(CURL_LIBS)
 
-particles_CPPFLAGS = -DGUI_MODULE  -DNO_AUDIO \
+particles_CPPFLAGS = -DGUI_MODULE  \
                       $(GTK2_CFLAGS) $(GTHREAD_CFLAGS) $(CURL_CFLAGS) $(MSBITFIELDS)