revised disis build system using kluge to get it to compile on OSX

externals/disis/Makefile.pdlibbuilder → externals/disis/Makefile.pdlibbuilder.revised

@@ -537,8 +537,8 @@ ifeq ($(system), Darwin)
     arch.ld.flags := -arch ppc -arch i386 -arch x86_64 -mmacosx-version-min=10.4
   endif
   ifeq ($(machine), x86_64)
-    arch.c.flags := -arch i386 -arch x86_64 -mmacosx-version-min=10.5
-    arch.ld.flags := -arch i386 -arch x86_64 -mmacosx-version-min=10.5
+    arch.c.flags := -arch x86_64 -mmacosx-version-min=10.5
+    arch.ld.flags := -arch x86_64 -mmacosx-version-min=10.5
   endif
 endif
 

externals/disis/makefile

@@ -22,13 +22,9 @@ CWIID_LIB_STATIC= $(CWIID_PATH)/libcwiid/libcwiid.a
 CWIID_INCLUDE = -I$(CWIID_PATH)/libcwiid
 cflags = $(CWIID_INCLUDE)
 
-define forDarwin
-    disis_wiimote.class.sources = disis_wiimote.c
-    disis_wiimote.class.ldlibs = $(CWIID_LIB_STATIC) -lbluetooth -lpthread
-endef
 define forLinux
     disis_wiimote.class.sources = disis_wiimote.c
     disis_wiimote.class.ldlibs = $(CWIID_LIB_STATIC) -lbluetooth -lpthread
 endef
 
-include Makefile.pdlibbuilder
+include Makefile.pdlibbuilder.revised