From 53fb77e7ad17ce9a6d55b3c77fb60e8d6f2bb819 Mon Sep 17 00:00:00 2001 From: Michael McMaster Date: Mon, 14 Jul 2014 20:28:33 +1000 Subject: [PATCH] Fix compile on OSX. Moved to clang++ for better c++11 support. No more fat binaries, min OSX 10.7 --- software/bootloaderhost/Makefile | 9 ++++----- software/bootloaderhost/main.cc | 2 +- software/scsi2sd-config/Makefile | 9 ++++----- software/scsi2sd-debug/Makefile | 9 ++++----- 4 files changed, 13 insertions(+), 16 deletions(-) diff --git a/software/bootloaderhost/Makefile b/software/bootloaderhost/Makefile index d12da46..6868b2b 100644 --- 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 b48cdb2..8c8772e 100644 --- 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 0b75eec..b75e7cc 100644 --- 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 c89406e..34f7c3b 100644 --- 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 -- 2.38.5