[Gridflow-cvs] [svn] commit: r5788 - /trunk/configure

svn-gridflow at artengine.ca svn-gridflow at artengine.ca
Tue Jul 27 17:39:08 EDT 2010


Author: matju
Date: Tue Jul 27 17:39:07 2010
New Revision: 5788

Log:
take two

Modified:
    trunk/configure

Modified: trunk/configure
==============================================================================
--- trunk/configure (original)
+++ trunk/configure Tue Jul 27 17:39:07 2010
@@ -87,6 +87,7 @@
 	:DEFINES => {:CPU => nil},
 	:CC => "g++",
 	:OBJS => [],
+	:PDLIB => ["gridflow$(PDSUF)"],
 }
 
 def launch stdin,stdout,stderr,*command # -> returncode
@@ -118,6 +119,7 @@
 	attr2 :tag
 	attr2 :name
 	attr2 :status
+	attr2 :uses_pdlib
 	attr2 :uses_so
 	attr2 :uses_o
 	attr2 :uses_h
@@ -597,9 +599,7 @@
 	tag :opengl
 	name "GEM support (versions 91, 92, 93, 92/93 hybrid)"
 	uses_feature [:puredata]
-	uses_o ["src/gem9292$(PDSUF)"]
-	uses_o ["src/gem9293$(PDSUF)"]
-	uses_o ["src/gem9393$(PDSUF)"]
+	uses_pdlib ["src/gem9292$(PDSUF)","src/gem9293$(PDSUF)","src/gem9393$(PDSUF)"]
         uses_so $LIBX11DIR+["-lGL"] if not WIN
         uses_h ["GL/gl.h"]
 	options ["HAVE_GEM"]
@@ -742,6 +742,7 @@
 	$conf[:LDSOFLAGS].concat(feature.uses_so||[]).uniq!
 	$conf[:OBJS].concat(feature.uses_o||[])
 	$conf[:OPTIONS].concat(feature.options||[])
+	$conf[:PDLIB].concat(feature.uses_pdlib||[])
 	for k,v in feature.defines||{} do $conf[:DEFINES][k]=(if Proc===v then v[] else v end) end
 	true
 end
@@ -783,6 +784,7 @@
   f.puts "OBJS = #{$conf[:OBJS].join(" ")}"
   f.puts "DLEXT = #{CONFIG['DLEXT']}"
   f.puts ""
+  f.puts "PDLIB = "+$conf[:PDLIB].join(" ")
 } # end open config.make
 
 #--------------------------------#



More information about the Gridflow-cvs mailing list