浏览代码

Fix compile on OSX.

Moved to clang++ for better c++11 support. No more fat binaries,
min OSX 10.7
Michael McMaster 11 年之前
父节点
当前提交
c9d34a59de

+ 4 - 5
lib/SCSI2SD/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
 

+ 1 - 1
lib/SCSI2SD/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;

+ 4 - 5
lib/SCSI2SD/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
 

+ 4 - 5
lib/SCSI2SD/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