[Gridflow-cvs] [svn] commit: r5794 - in /trunk: Makefile configure

svn-gridflow at artengine.ca svn-gridflow at artengine.ca
Tue Jul 27 19:06:09 EDT 2010


Author: matju
Date: Tue Jul 27 19:06:08 2010
New Revision: 5794

Log:
take fève

Modified:
    trunk/Makefile
    trunk/configure

Modified: trunk/Makefile
==============================================================================
--- trunk/Makefile (original)
+++ trunk/Makefile Tue Jul 27 19:06:08 2010
@@ -1,7 +1,7 @@
 #!/usr/bin/make
 
 include config.make
-#COMMON_DEPS = config.make Makefile src/source_filter.rb
+COMMON_DEPS = config.make Makefile src/source_filter.rb
 COMMON_DEPS2 = $(COMMON_DEPS) src/gridflow.hxx.fcs
 RUBY = ruby
 
@@ -87,11 +87,11 @@
 $(PDLIB1): $(OBJS2) $(OBJS) $(H) $(COMMON_DEPS)
 	$(CXX) -DPDSUF=\"$(PDSUF)\" $(CFLAGS) $(PDBUNDLEFLAGS) $(LIBPATH) -xnone $(OBJS2) $(OBJS) $(LDSOFLAGS) -o $@
 
-gridflow-gem9292$(PDSUF): src/gem.cxx.fcs $(H) $(COMMON_DEPS)
+gridflow_gem9292$(PDSUF): src/gem.cxx.fcs $(H) $(COMMON_DEPS)
 	$(CXX) $(CFLAGS) $(PDBUNDLEFLAGS) $(LIBPATH)                              -xc++ src/gem.cxx.fcs -o $@
-gridflow-gem9293$(PDSUF): src/gem.cxx.fcs $(H) $(COMMON_DEPS)
+gridflow_gem9293$(PDSUF): src/gem.cxx.fcs $(H) $(COMMON_DEPS)
 	$(CXX) $(CFLAGS) $(PDBUNDLEFLAGS) $(LIBPATH) -DGEMSTATE93                 -xc++ src/gem.cxx.fcs -o $@
-gridflow-gem9393$(PDSUF): src/gem.cxx.fcs $(H) $(COMMON_DEPS)
+gridflow_gem9393$(PDSUF): src/gem.cxx.fcs $(H) $(COMMON_DEPS)
 	$(CXX) $(CFLAGS) $(PDBUNDLEFLAGS) $(LIBPATH) -DGEMSTATE93 -DIMAGESTRUCT93 -xc++ src/gem.cxx.fcs -o $@
 
 beep::

Modified: trunk/configure
==============================================================================
--- trunk/configure (original)
+++ trunk/configure Tue Jul 27 19:06:08 2010
@@ -583,11 +583,9 @@
 Feature.add {
 	tag :opengl
 	name "OpenGL (for GEM support, etc)"
-	uses_feature [:puredata]
-	uses_o ["src/gem.o"]
         uses_so $LIBX11DIR+["-lGL"] if not WIN
         uses_h ["GL/gl.h"]
-	options ["HAVE_GEM"]
+	options ["HAVE_OPENGL"]
 	test proc {
 		c_test %`
                 #include#
@@ -598,10 +596,10 @@
 Feature.add {
 	tag :gem
 	name "GEM support (versions 91, 92, 93, 92/93 hybrid)"
-	uses_feature [:puredata]
-	uses_pdlib ["gridflow-gem9292$(PDSUF)",
-		    "gridflow-gem9293$(PDSUF)",
-		    "gridflow-gem9393$(PDSUF)"]
+	uses_feature [:puredata,:opengl]
+	uses_pdlib ["gridflow_gem9292$(PDSUF)",
+		    "gridflow_gem9293$(PDSUF)",
+		    "gridflow_gem9393$(PDSUF)"]
         uses_so $LIBX11DIR+["-lGL"] if not WIN
         uses_h ["GL/gl.h"]
 	options ["HAVE_GEM"]



More information about the Gridflow-cvs mailing list