[Gridflow-cvs] [svn] commit: r4924 - in /trunk: Makefile abstractions/gf.io_generate.pd configure

gridflow-cvs at artengine.ca gridflow-cvs at artengine.ca
Sun Jan 24 18:31:08 EST 2010


Author: matju
Date: Sun Jan 24 18:31:07 2010
New Revision: 4924

Log:
win32

Modified:
    trunk/Makefile
    trunk/abstractions/gf.io_generate.pd
    trunk/configure

Modified: trunk/Makefile
==============================================================================
--- trunk/Makefile (original)
+++ trunk/Makefile Sun Jan 24 18:31:07 2010
@@ -13,7 +13,7 @@
 
 LDSOFLAGS += -lm $(LIBS)
 OBJS2 = src/gridflow.o src/grid.o src/classes1.o src/classes2.o src/number.1.o src/number.2.o src/number.3.o src/number.4.o src/formats.o
-OS = $(shell uname -s | sed -e 's/^MINGW.*/NT/')
+OS = $(shell uname -s | sed -e 's/^MINGW.*/nt/')
 FILT = $(RUBY) -w src/source_filter.rb
 ifeq ($(OS),darwin)
   CFLAGS += -mmacosx-version-min=10.4
@@ -25,7 +25,7 @@
     PDSUF = .dll
     PDBUNDLEFLAGS = -shared
     LDSOFLAGS += -L/c/Program\ Files/pd/bin -lpd
-    CFLAGS += -DDES_BUGS
+    CFLAGS += -DDES_BUGS -mms-bitfields
   else
     PDSUF = .pd_linux
     PDBUNDLEFLAGS = -shared -rdynamic
@@ -96,9 +96,14 @@
 	apply_colormap_channelwise checkers contrast posterize ravel remap_image solarize spread \
 	rgb_to_greyscale greyscale_to_rgb rgb_to_yuv yuv_to_rgb rotate in out
 
-aliases:: deprecated/@fade.pd deprecated/@!.pd doc/flow_classes/@complex_sq-help.pd \
-  doc/flow_classes/inv+-help.pd  abstractions/inv+.pd \
-  doc/flow_classes/inv\*-help.pd abstractions/inv\*.pd
+ALIASES += deprecated/@fade.pd deprecated/@!.pd doc/flow_classes/@complex_sq-help.pd
+ALIASES += doc/flow_classes/inv+-help.pd  abstractions/inv+.pd
+ifeq ($(OS),nt)
+else
+ALIASES += doc/flow_classes/inv\*-help.pd abstractions/inv\*.pd
+endif
+
+aliases:: $(ALIASES)
 
 deprecated/@fade.pd: abstractions/\#fade.pd
 	for z in $(DEPRECATED); do cp abstractions/\#$$z.pd deprecated/\@$$z.pd; done

Modified: trunk/abstractions/gf.io_generate.pd
==============================================================================
--- trunk/abstractions/gf.io_generate.pd (original)
+++ trunk/abstractions/gf.io_generate.pd Sun Jan 24 18:31:07 2010
@@ -1,81 +1,95 @@
-#N canvas 491 139 789 550 10;
-#X msg 74 492 connect 0 0 2 0 \, connect 2 0 1 0;
-#X obj 96 353 list trim;
-#X obj 96 75 list split 1;
-#X obj 96 114 gf.suffix_lookup;
-#X obj 143 276 list append;
-#X obj 96 315 list prepend;
-#X obj 96 213 t b s;
-#X obj 96 94 t s s;
-#X obj 9 10 inlet;
-#X obj 322 65 \$1;
-#X obj 184 315 pack s s s;
-#X obj 251 292 symbol \$2;
-#X obj 251 273 loadbang;
-#X obj 74 518 outlet;
-#X obj 74 48 t b a b;
-#X obj 212 114 sel window;
-#X obj 143 257 list append \$2;
-#X obj 9 29 route bang;
-#X msg 322 443 clear \, obj 0 0 r \$1-in \, obj 0 40 s \$1-out;
-#X obj 96 334 list prepend obj 0 20;
-#X obj 9 313 \$1;
-#X obj 143 238 makefilename #io.%s;
-#X obj 213 157 class_exists;
-#X obj 213 176 sel 0 1;
-#X msg 213 138 symbol #io.quartz;
-#X msg 213 214 symbol x11;
-#X msg 231 195 symbol quartz;
-#X obj 96 142 route bang;
-#X obj 409 233 gf.error unknown suffix '%s';
-#X obj 409 214 list;
-#X msg 31 426 obj 0 20 gf.not_open;
-#X obj 9 332 t a a a;
-#X obj 96 380 t b a;
-#X msg 96 399 else obj 0 20 gf.not_open;
-#X connect 0 0 13 0;
-#X connect 1 0 32 0;
-#X connect 2 0 7 0;
-#X connect 2 1 4 1;
-#X connect 3 0 27 0;
-#X connect 3 1 29 1;
-#X connect 3 2 15 0;
-#X connect 4 0 19 0;
-#X connect 5 0 19 0;
-#X connect 6 0 5 0;
-#X connect 6 1 10 0;
-#X connect 7 0 3 0;
-#X connect 7 1 10 2;
-#X connect 8 0 17 0;
-#X connect 9 0 18 0;
-#X connect 10 0 5 1;
-#X connect 11 0 10 1;
-#X connect 12 0 11 0;
-#X connect 14 0 0 0;
-#X connect 14 1 2 0;
-#X connect 14 2 9 0;
-#X connect 15 0 24 0;
-#X connect 15 1 21 0;
-#X connect 16 0 4 0;
-#X connect 17 0 20 0;
-#X connect 17 1 14 0;
-#X connect 18 0 13 0;
-#X connect 19 0 1 0;
-#X connect 20 0 31 0;
-#X connect 21 0 16 0;
-#X connect 22 0 23 0;
-#X connect 23 0 25 0;
-#X connect 23 1 26 0;
-#X connect 24 0 22 0;
-#X connect 25 0 21 0;
-#X connect 26 0 21 0;
-#X connect 27 0 29 0;
-#X connect 27 1 6 0;
-#X connect 29 0 28 0;
-#X connect 30 0 13 0;
-#X connect 31 0 0 0;
-#X connect 31 1 30 0;
-#X connect 31 2 18 0;
-#X connect 32 0 33 0;
-#X connect 32 1 13 0;
-#X connect 33 0 13 0;
+#N canvas 481 138 789 550 10;
+#X msg 74 492 connect 0 0 2 0 \, connect 2 0 1 0;
+#X obj 96 353 list trim;
+#X obj 96 75 list split 1;
+#X obj 96 114 gf.suffix_lookup;
+#X obj 143 276 list append;
+#X obj 96 315 list prepend;
+#X obj 96 213 t b s;
+#X obj 96 94 t s s;
+#X obj 9 10 inlet;
+#X obj 322 65 \$1;
+#X obj 184 315 pack s s s;
+#X obj 251 292 symbol \$2;
+#X obj 251 273 loadbang;
+#X obj 74 518 outlet;
+#X obj 74 48 t b a b;
+#X obj 382 8 sel window;
+#X obj 143 257 list append \$2;
+#X obj 9 29 route bang;
+#X msg 322 443 clear \, obj 0 0 r \$1-in \, obj 0 40 s \$1-out;
+#X obj 96 334 list prepend obj 0 20;
+#X obj 9 313 \$1;
+#X obj 143 238 makefilename #io.%s;
+#X obj 382 46 class_exists;
+#X msg 382 27 symbol #io.quartz;
+#X obj 96 142 route bang;
+#X obj 347 317 gf.error unknown suffix '%s';
+#X obj 347 298 list;
+#X msg 31 426 obj 0 20 gf.not_open;
+#X obj 9 332 t a a a;
+#X obj 96 380 t b a;
+#X msg 96 399 else obj 0 20 gf.not_open;
+#X obj 382 65 sel 1;
+#X obj 409 122 class_exists;
+#X obj 409 141 sel 1;
+#X msg 382 84 symbol quartz;
+#X msg 409 103 symbol #io.x11;
+#X msg 409 160 symbol x11;
+#X msg 436 179 symbol sdl;
+#X obj 342 209 t s;
+#X obj 430 228 print;
+#X msg 133 165;
+#X connect 0 0 13 0;
+#X connect 1 0 29 0;
+#X connect 2 0 7 0;
+#X connect 2 1 4 1;
+#X connect 3 0 24 0;
+#X connect 3 1 26 1;
+#X connect 3 2 15 0;
+#X connect 4 0 19 0;
+#X connect 5 0 19 0;
+#X connect 6 0 5 0;
+#X connect 6 1 10 0;
+#X connect 7 0 3 0;
+#X connect 7 1 10 2;
+#X connect 8 0 17 0;
+#X connect 9 0 18 0;
+#X connect 10 0 5 1;
+#X connect 11 0 10 1;
+#X connect 12 0 11 0;
+#X connect 14 0 0 0;
+#X connect 14 1 2 0;
+#X connect 14 2 9 0;
+#X connect 15 0 23 0;
+#X connect 15 1 38 0;
+#X connect 16 0 4 0;
+#X connect 17 0 20 0;
+#X connect 17 1 14 0;
+#X connect 18 0 13 0;
+#X connect 19 0 1 0;
+#X connect 20 0 28 0;
+#X connect 21 0 16 0;
+#X connect 22 0 31 0;
+#X connect 23 0 22 0;
+#X connect 24 0 26 0;
+#X connect 24 1 6 0;
+#X connect 26 0 25 0;
+#X connect 27 0 13 0;
+#X connect 28 0 0 0;
+#X connect 28 1 27 0;
+#X connect 28 2 18 0;
+#X connect 29 0 30 0;
+#X connect 29 1 13 0;
+#X connect 30 0 13 0;
+#X connect 31 0 34 0;
+#X connect 31 1 35 0;
+#X connect 32 0 33 0;
+#X connect 33 0 36 0;
+#X connect 33 1 37 0;
+#X connect 34 0 38 0;
+#X connect 35 0 32 0;
+#X connect 36 0 38 0;
+#X connect 37 0 38 0;
+#X connect 38 0 39 0;
+#X connect 38 0 21 0;

Modified: trunk/configure
==============================================================================
--- trunk/configure (original)
+++ trunk/configure Sun Jan 24 18:31:07 2010
@@ -238,9 +238,9 @@
 	name "GNU C++ Compiler 3 (or 4)"
 	options ["HAVE_GCC3"]
 	defines :GCC_VERSION => proc {
-		m = /GCC_VERSION\s+(.*)/.match(File.popen("tmp/#{$$}","r"){|f| f.read })
-		m[1]
-		#"3.666"
+		#m = /GCC_VERSION\s+(.*)/.match(File.popen("tmp/#{$$}","r"){|f| f.read })
+		#m[1]
+		"3.666"
 	}
 	# how does this handle two test procs again?
 	test proc {



More information about the Gridflow-cvs mailing list