Osx hackz.

2 files changed, 18 insertions, 18 deletions

diff --git a/Makefile b/Makefile
index 5cd1efb..b9a0226 100644
--- a/Makefile
+++ b/Makefile
@@ -33,56 +33,53 @@ endef
 generic:
 	$(call generate_common,$@)
 
-osx:	
+osx:
 	$(call generate_common,$@)
 
+osx-32:
+	$(call generate_common,$@,-DCMAKE_OSX_ARCHITECTURES=i386)
+
 cortex-m0:
 	$(call generate_common,$@)
-	
+
 cortex-m0+:
 	$(call generate_common,$@)
-	
+
 cortex-m3:
 	$(call generate_common,$@)
-	
+
 cortex-m4:
 	$(call generate_common,$@)
-	
+
 cortex-m4f:
 	$(call generate_common,$@)
-	
+
 cortex-m7:
 	$(call generate_common,$@)
 
 arm-sim:
 	$(call generate_common,$@)
 
-avrxmega7: 
+avrxmega7:
 	$(call generate_common,$@)
 
 msp430:
 	$(call generate_common,$@)
-	
+
 mingw:
 	$(call generate_common,$@,-DWIN32=1)
-	
+
 lib_only:
 	rm -R -f build_lib_only
 	mkdir build_lib_only
 	cd build_lib_only && cmake $(COMMON_DEFINITIONS) -DLIB_ONLY=TRUE ..
 
-all: 
+all:
 	generic
 
 clean:
 	rm -R -f build_*
 	rm -R -f ext_images
 
-	
-include fs_test.mk
-
-
-	
 
-	
-	
+include fs_test.mk
diff --git a/cscript b/cscript
index a8dcbd0..3fb9488 100644
--- a/cscript
+++ b/cscript
@@ -23,7 +23,10 @@ def build(target, options):
         blockdev = 'linux'
         ext = 'so'
     elif target.platform == 'osx':
-        type = 'generic'
+        if target.bits == 64:
+            type = 'osx'
+        else:
+            type = 'osx-32'
         blockdev = 'linux'
         ext = 'dylib'
     elif target.platform == 'windows':