Fix compile on OSX.

Moved to clang++ for better c++11 support. No more fat binaries,
min OSX 10.7

diff --git a/software/bootloaderhost/Makefile b/software/bootloaderhost/Makefile
index d12da46446957585e5b76f30f583988a12958d10..6868b2b8467d3424e3236741470f72ed1e248556 100644 (file)
--- a/software/bootloaderhost/Makefile
+++ b/software/bootloaderhost/Makefile
@@ -30,11 +30,10 @@ ifeq ($(TARGET),Darwin)
        # Should match OSX
        VPATH += hidapi/mac
        LDFLAGS += -framework IOKit -framework CoreFoundation
-       CPPFLAGS += -isysroot /Xcode3.1.4/SDKs/MacOSX10.5.sdk
-       CFLAGS += -mmacosx-version-min=10.5 -arch x86_64 -arch i386 -arch ppc
-       CXXFLAGS += -mmacosx-version-min=10.5 -arch x86_64 -arch i386 -arch ppc
-       CC=/Xcode3.1.4/usr/bin/gcc
-       CXX=/Xcode3.1.4/usr/bin/g++
+       CFLAGS += -mmacosx-version-min=10.7
+       CXXFLAGS += -stdlib=libc++ -mmacosx-version-min=10.7
+       CC=clang
+       CXX=clang++
        BUILD=build/mac
 endif
 

diff --git a/software/bootloaderhost/main.cc b/software/bootloaderhost/main.cc
index b48cdb2bcbc0a1a6dfe813cdb603a531c937186e..8c8772e17cbec263e9c4254617194af3cc534111 100644 (file)
--- a/software/bootloaderhost/main.cc
+++ b/software/bootloaderhost/main.cc
@@ -175,7 +175,7 @@ int main(int argc, char* argv[])
        std::stringstream firmMsg;
        firmMsg <<
                "  Firmware Silicon ID:\t" <<  std::hex << firmware.siliconId() <<
-                       "\n" <<
+                       "\n";
        std::cout << firmMsg.str() << std::endl;
 
        std::cout << "Starting firmware upload: " << filename << std::endl;

diff --git a/software/scsi2sd-config/Makefile b/software/scsi2sd-config/Makefile
index 0b75eec18325e419003cc689a48999710598c927..b75e7cc72b632164464fdf89a5486054d90c3cfd 100644 (file)
--- a/software/scsi2sd-config/Makefile
+++ b/software/scsi2sd-config/Makefile
@@ -30,11 +30,10 @@ ifeq ($(TARGET),Darwin)
        # Should match OSX
        VPATH += ../bootloaderhost/hidapi/mac
        LDFLAGS += -framework IOKit -framework CoreFoundation
-       CPPFLAGS += -isysroot /Xcode3.1.4/SDKs/MacOSX10.5.sdk
-       CFLAGS += -mmacosx-version-min=10.5 -arch x86_64 -arch i386 -arch ppc
-       CXXFLAGS += -mmacosx-version-min=10.5 -arch x86_64 -arch i386 -arch ppc
-       CC=/Xcode3.1.4/usr/bin/gcc
-       CXX=/Xcode3.1.4/usr/bin/g++
+       CFLAGS += -mmacosx-version-min=10.7
+       CXXFLAGS += -stdlib=libc++ -mmacosx-version-min=10.7
+       CC=clang
+       CXX=clang++
        BUILD=build/mac
 endif
 

diff --git a/software/scsi2sd-debug/Makefile b/software/scsi2sd-debug/Makefile
index c89406e121f13a346e81ef9359f81c2e64dea1ff..34f7c3b8e1b96a204f5a9d1e4694b9ef98f105bf 100644 (file)
--- a/software/scsi2sd-debug/Makefile
+++ b/software/scsi2sd-debug/Makefile
@@ -30,11 +30,10 @@ ifeq ($(TARGET),Darwin)
        # Should match OSX
        VPATH += ../bootloaderhost/hidapi/mac
        LDFLAGS += -framework IOKit -framework CoreFoundation
-       CPPFLAGS += -isysroot /Xcode3.1.4/SDKs/MacOSX10.5.sdk
-       CFLAGS += -mmacosx-version-min=10.5 -arch x86_64 -arch i386 -arch ppc
-       CXXFLAGS += -mmacosx-version-min=10.5 -arch x86_64 -arch i386 -arch ppc
-       CC=/Xcode3.1.4/usr/bin/gcc
-       CXX=/Xcode3.1.4/usr/bin/g++
+       CFLAGS += -mmacosx-version-min=10.7
+       CXXFLAGS += -stdlib=libc++ -mmacosx-version-min=10.7
+       CC=clang
+       CXX=clang++
        BUILD=build/mac
 endif