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

svn-gridflow at artengine.ca svn-gridflow at artengine.ca
Fri Oct 8 13:25:59 EDT 2010


Author: matju
Date: Fri Oct  8 13:25:58 2010
New Revision: 6415

Log:
x11 support compiled separately. This will be the REAL 9.12 THIS TIME

Modified:
    trunk/Makefile
    trunk/configure

Modified: trunk/Makefile
==============================================================================
--- trunk/Makefile (original)
+++ trunk/Makefile Fri Oct  8 13:25:58 2010
@@ -13,7 +13,6 @@
 LDSOFLAGS += -lm $(LIBS)
 OBJS2 = src/gridflow.o src/grid.o src/classes1.o src/classes2.o src/classes3.o src/expr.o src/classes_gui.o \
 src/numop1.o src/numop2.1.o src/numop2.2.o src/numop2.3.o src/numop2.4.o src/formats.o
-PDLIB += gridflow_pdp$(PDSUF) gridflow_unicorn$(PDSUF)
 
 OS = $(shell uname -s | sed -e 's/^MINGW.*/nt/')
 FILT = $(RUBY) -w src/source_filter.rb
@@ -102,6 +101,8 @@
 	$(CXX) $(CFLAGS) $(PDBUNDLEFLAGS) $(LIBPATH)                              -o $@ -xc++ src/pdp.cxx.fcs
 gridflow_unicorn$(PDSUF):    src/unicorn.cxx.fcs    $(H) $(COMMON_DEPS)
 	$(CXX) $(CFLAGS) $(PDBUNDLEFLAGS) $(LIBPATH)                              -o $@ -xc++ src/unicorn.cxx.fcs
+gridflow_x11$(PDSUF):        src/x11.cxx.fcs        $(H) $(COMMON_DEPS)
+	$(CXX) $(CFLAGS) $(PDBUNDLEFLAGS) $(LIBPATH)                              -o $@ -xc++ src/x11.cxx.fcs
 
 beep::
 	@for z in 1 2 3 4 5; do echo -ne '\a'; sleep 1; done

Modified: trunk/configure
==============================================================================
--- trunk/configure (original)
+++ trunk/configure Fri Oct  8 13:25:58 2010
@@ -87,7 +87,7 @@
 	:DEFINES => {:CPU => nil},
 	:CC => "g++",
 	:OBJS => [],
-	:PDLIB => ["gridflow$(PDSUF)"],
+	:PDLIB => ["gridflow","gridflow_pdp","gridflow_unicorn"],
 }
 
 def launch stdin,stdout,stderr,*command # -> returncode
@@ -336,7 +336,8 @@
 	name "X11 Display Protocol"
 	uses_so $LIBX11
 	uses_h ["X11/Xlib.h"]
-	produces_o ["src/x11.o"]
+	#produces_o ["src/x11.o"]
+	produces_pdlib ["gridflow_x11"]
 	test proc {c_test "
 		#include#
 		int main () {return XSetErrorHandler==0;}"}}
@@ -537,7 +538,7 @@
 	tag :opengl
 	name "OpenGL/GLEW (for GEM support and [gf/gl])"
 	produces_o ["src/opengl.o"]
-	produces_pdlib ["gridflow_gem_loader$(PDSUF)","gridflow_gem9292$(PDSUF)","gridflow_gem9293$(PDSUF)","gridflow_gem9393$(PDSUF)"]
+	produces_pdlib ["gridflow_gem_loader","gridflow_gem9292","gridflow_gem9293","gridflow_gem9393"]
         uses_so $LIBX11DIR+["-lGLEW"] if not WIN
 	uses_so ["-lglu32","-lopengl32","-lglew32"] if WIN
         uses_h ["GL/glew.h"]
@@ -727,7 +728,7 @@
   f.puts "OBJS = #{$conf[:OBJS].join(" ")}"
   f.puts "DLEXT = #{CONFIG['DLEXT']}"
   f.puts ""
-  f.puts "PDLIB = "+$conf[:PDLIB].join(" ")
+  f.puts "PDLIB = "+$conf[:PDLIB].map{|x|x+"$(PDSUF)"}.join(" ")
 } # end open config.make
 
 #--------------------------------#



More information about the Gridflow-cvs mailing list