From b536cbd6b251207e77daa79d615134e3056e1acc Mon Sep 17 00:00:00 2001
From: Jonathan Wilkes <jon.w.wilkes@gmail.com>
Date: Tue, 13 Sep 2016 19:06:50 -0400
Subject: [PATCH] revised disis build system using kluge to get it to compile
on OSX
---
...{Makefile.pdlibbuilder => Makefile.pdlibbuilder.revised} | 4 ++--
externals/disis/makefile | 6 +-----
2 files changed, 3 insertions(+), 7 deletions(-)
rename externals/disis/{Makefile.pdlibbuilder => Makefile.pdlibbuilder.revised} (99%)
diff --git a/externals/disis/Makefile.pdlibbuilder b/externals/disis/Makefile.pdlibbuilder.revised
similarity index 99%
rename from externals/disis/Makefile.pdlibbuilder
rename to externals/disis/Makefile.pdlibbuilder.revised
index bb02fe103..ed11b2259 100644
--- a/externals/disis/Makefile.pdlibbuilder
+++ b/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
diff --git a/externals/disis/makefile b/externals/disis/makefile
index ebac23f23..8eba0a9ff 100755
--- a/externals/disis/makefile
+++ b/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
--
GitLab