From 68925a41f90a5bd90eed19dccb36011ddf7992e0 Mon Sep 17 00:00:00 2001 From: Mathieu Virbel Date: Fri, 2 Dec 2011 16:28:03 +0100 Subject: [PATCH] update build sdl to fix issue with divmodsi4 (use llvm-gcc-4.2 instead of clang, to keep the same compiler for all other projects.) + fix copy of libSDL.a into our build directory --- build_sdl.sh | 5 +++-- .../Xcode-iPhoneOS/SDL/SDLiPhoneOS.xcodeproj/project.pbxproj | 4 ++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/build_sdl.sh b/build_sdl.sh index 8f7de61..8ebe2c7 100755 --- a/build_sdl.sh +++ b/build_sdl.sh @@ -1,8 +1,9 @@ #!/bin/bash -. ./environmnent.sh +. ./environment.sh pushd sdl/sdl1.3/Xcode-iPhoneOS/SDL -xcodebuild -project SDLiPhoneOS.xcodeproj -alltargets +xcodebuild -project SDLiPhoneOS.xcodeproj -target libSDL popd + #the binarie is under sdl/sdl1.3/Xcode-iPhoneOS/SDL/build/Release-Universal/ cp sdl/sdl1.3/Xcode-iPhoneOS/SDL/build/Release-iPhoneOS/libSDL.a $BUILDROOT/lib cp -a sdl/sdl1.3/include $BUILDROOT/include/SDL diff --git a/sdl/sdl1.3/Xcode-iPhoneOS/SDL/SDLiPhoneOS.xcodeproj/project.pbxproj b/sdl/sdl1.3/Xcode-iPhoneOS/SDL/SDLiPhoneOS.xcodeproj/project.pbxproj index d55be9a..246448c 100755 --- a/sdl/sdl1.3/Xcode-iPhoneOS/SDL/SDLiPhoneOS.xcodeproj/project.pbxproj +++ b/sdl/sdl1.3/Xcode-iPhoneOS/SDL/SDLiPhoneOS.xcodeproj/project.pbxproj @@ -1594,6 +1594,7 @@ "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; GCC_C_LANGUAGE_STANDARD = c99; GCC_DEBUGGING_SYMBOLS = full; + GCC_VERSION = com.apple.compilers.llvm.clang.1_0; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = NO; IPHONEOS_DEPLOYMENT_TARGET = 5.0; @@ -1610,6 +1611,7 @@ ARCHS = "$(ARCHS_STANDARD_32_BIT)"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; GCC_C_LANGUAGE_STANDARD = c99; + GCC_VERSION = com.apple.compilers.llvm.clang.1_0; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = NO; IPHONEOS_DEPLOYMENT_TARGET = 5.0; @@ -1626,6 +1628,7 @@ DEPLOYMENT_LOCATION = NO; GCC_DYNAMIC_NO_PIC = NO; GCC_OPTIMIZATION_LEVEL = 0; + GCC_VERSION = com.apple.compilers.llvmgcc42; PRODUCT_NAME = SDL; SKIP_INSTALL = YES; }; @@ -1638,6 +1641,7 @@ COPY_PHASE_STRIP = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEPLOYMENT_LOCATION = NO; + GCC_VERSION = com.apple.compilers.llvmgcc42; PRODUCT_NAME = SDL; SKIP_INSTALL = YES; ZERO_LINK = NO;