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

Timestamp:

May 27, 2005, 10:17:18 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: importer is now also run by framework

Location:

orxonox/trunk/src/subprojects/particles

Files:

• Makefile.am (modified) (1 diff)
• Makefile.in (modified) (2 diffs)
• particle_fun.cc (modified) (2 diffs)

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

@@ -36 +36 @@
                   -lpthread
 
-particles_CPPFLAGS = $(GTK2_CFLAGS) $(GTHREAD_CFLAGS) $(CURL_CFLAGS) $(MSBITFIELDS)
+particles_CPPFLAGS =  -DGUI_MODULE \
+                      $(GTK2_CFLAGS) $(GTHREAD_CFLAGS) $(CURL_CFLAGS) $(MSBITFIELDS)
 
 particles_SOURCES= ../framework.cc \

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

@@ -218 +218 @@
                   -lpthread
 
-particles_CPPFLAGS = $(GTK2_CFLAGS) $(GTHREAD_CFLAGS) $(CURL_CFLAGS) $(MSBITFIELDS)
+particles_CPPFLAGS = -DGUI_MODULE \
+                      $(GTK2_CFLAGS) $(GTHREAD_CFLAGS) $(CURL_CFLAGS) $(MSBITFIELDS)
+
 particles_SOURCES = ../framework.cc \
                    particle_fun.cc \
@@ -255 +257 @@
           esac; \
         done; \
-        echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/subprojects/particles/Makefile'; \
+        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/subprojects/particles/Makefile'; \
         cd $(top_srcdir) && \
-          $(AUTOMAKE) --foreign  src/subprojects/particles/Makefile
+          $(AUTOMAKE) --gnu  src/subprojects/particles/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status

orxonox/trunk/src/subprojects/particles/particle_fun.cc

@@ -22 +22 @@
 
 
-void Framework::moduleInit()
+void Framework::moduleInit(int argc, char** argv)
 {
   // Creating a Test Particle System
@@ -174 +174 @@
 
 
-void Framework::moduleInitGui(void)
+void Framework::moduleInitGui(int argc, char** argv)
 {
   Window* guiMainWindow = NULL;