Fix build breaks

diff --git a/extra/gpu/demos/bunny/bunny.factor b/extra/gpu/demos/bunny/bunny.factor
index bee94d302a1a5bb8c00322feeaaf0b4e0417bdb9..ae5757efcde715e81084f91c5a1e3bf49548bad5 100644 (file)
--- a/extra/gpu/demos/bunny/bunny.factor
+++ b/extra/gpu/demos/bunny/bunny.factor
@@ -34,12 +34,12 @@ GLSL-SHADER-FILE: window-vertex-shader vertex-shader "window.v.glsl"
 GLSL-SHADER-FILE: sobel-fragment-shader fragment-shader "sobel.f.glsl"
 GLSL-PROGRAM: sobel-program
     window-vertex-shader sobel-fragment-shader
-    window-vertex ;
+    window-vertex-format ;
 
 GLSL-SHADER-FILE: loading-fragment-shader fragment-shader "loading.f.glsl"
 GLSL-PROGRAM: loading-program
     window-vertex-shader loading-fragment-shader
-    window-vertex ;
+    window-vertex-format ;
 
 TUPLE: bunny-state
     vertexes

diff --git a/extra/gpu/demos/raytrace/raytrace.factor b/extra/gpu/demos/raytrace/raytrace.factor
index 2ad6c82d7cd3906991b7bdccf8055e8ec26a1321..bdd1b51deb28cbc3d948ca73ee7f81c4db8aa8ab 100644 (file)
--- a/extra/gpu/demos/raytrace/raytrace.factor
+++ b/extra/gpu/demos/raytrace/raytrace.factor
@@ -10,7 +10,7 @@ GLSL-SHADER-FILE: raytrace-vertex-shader vertex-shader "raytrace.v.glsl"
 GLSL-SHADER-FILE: raytrace-fragment-shader fragment-shader "raytrace.f.glsl"
 GLSL-PROGRAM: raytrace-program
     raytrace-vertex-shader raytrace-fragment-shader
-    window-vertex ;
+    window-vertex-format ;
 
 UNIFORM-TUPLE: sphere-uniforms
     { "center" vec3-uniform  f }

diff --git a/extra/macho/macho.factor b/extra/macho/macho.factor
index ea71583072416fb4b4541b89fb50a9a4524e0645..d371b3ac7201791c72060078bab559c58f970a8e 100644 (file)
--- a/extra/macho/macho.factor
+++ b/extra/macho/macho.factor
@@ -1,7 +1,6 @@
 ! Copyright (C) 2010 Erik Charlebois.
 ! See http:// factorcode.org/license.txt for BSD license.
-USING: alien.c-types alien.syntax classes.struct kernel literals math
-unix.types ;
+USING: alien.c-types alien.syntax classes.struct kernel literals math unix.types ;
 IN: macho
 
 TYPEDEF: int       integer_t
@@ -524,7 +523,7 @@ CONSTANT: CPU_TYPE_VAX            1
 CONSTANT: CPU_TYPE_MC680x0        6
 CONSTANT: CPU_TYPE_X86            7
 CONSTANT: CPU_TYPE_I386           $ CPU_TYPE_X86
-CONSTANT: CPU_TYPE_X86_64         $[ CPU_TYPE_X86 CPU_ARCH_ABI64 bitor ]
+CONSTANT: CPU_TYPE_X86_64         $[ $ CPU_TYPE_X86 $ CPU_ARCH_ABI64 bitor ]
 CONSTANT: CPU_TYPE_MC98000        10
 CONSTANT: CPU_TYPE_HPPA           11
 CONSTANT: CPU_TYPE_ARM            12
@@ -532,7 +531,7 @@ CONSTANT: CPU_TYPE_MC88000        13
 CONSTANT: CPU_TYPE_SPARC          14
 CONSTANT: CPU_TYPE_I860           15
 CONSTANT: CPU_TYPE_POWERPC        18
-CONSTANT: CPU_TYPE_POWERPC64      $[ $ CPU_TYPE_POWERPC CPU_ARCH_ABI64 bitor ]
+CONSTANT: CPU_TYPE_POWERPC64      $[ $ CPU_TYPE_POWERPC $ CPU_ARCH_ABI64 bitor ]
 
 CONSTANT: CPU_SUBTYPE_MASK    HEX: ff000000
 CONSTANT: CPU_SUBTYPE_LIB64   HEX: 80000000