Fix compile on OSX.

Moved to clang++ for better c++11 support. No more fat binaries,
min OSX 10.7
This commit is contained in:
Michael McMaster 2014-07-14 20:28:33 +10:00
parent 2cb04473ba
commit 53fb77e7ad
4 changed files with 13 additions and 16 deletions

View File

@ -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

View File

@ -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;

View File

@ -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

View File

@ -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