diff --git a/sc2/build/unix/config_proginfo_build b/sc2/build/unix/config_proginfo_build index 5228161e4..4d782fb60 100644 --- a/sc2/build/unix/config_proginfo_build +++ b/sc2/build/unix/config_proginfo_build @@ -62,9 +62,9 @@ useGccBuildTools() { } case "$HOST_SYSTEM" in Darwin) - EXTRA_PLATFORM_GCC_FLAGS_COMPILE_C='-mmacosx-version-min=10.4 -arch i386' - EXTRA_PLATFORM_GCC_FLAGS_COMPILE_OBJC='-mmacosx-version-min=10.4 -arch i386' - EXTRA_PLATFORM_GCC_FLAGS_LINK='-mmacosx-version-min=10.4 -arch i386' + EXTRA_PLATFORM_GCC_FLAGS_COMPILE_C='-mmacosx-version-min=10.6 -arch i386 -arch x86_64' + EXTRA_PLATFORM_GCC_FLAGS_COMPILE_OBJC='-mmacosx-version-min=10.6 -arch i386 -arch x86_64' + EXTRA_PLATFORM_GCC_FLAGS_LINK='-mmacosx-version-min=10.6 -arch i386 -arch x86_64' useGccBuildTools ;; WINSCW) @@ -250,7 +250,7 @@ PROG_windres_VERSION='windres --version' ### Rez resource compiler (for MacOS X) ### PROG_Rez_NAME="Rez resource compiler (Apple Developer Tools)" -PROG_Rez_FILE="/Developer/Tools/Rez" +PROG_Rez_FILE="/usr/bin/Rez" PROG_Rez_ACTION="" PROG_Rez_VERSION='' diff --git a/sc2/build/unix/config_proginfo_host b/sc2/build/unix/config_proginfo_host index 6e0466c2b..36f9d0d7d 100644 --- a/sc2/build/unix/config_proginfo_host +++ b/sc2/build/unix/config_proginfo_host @@ -55,11 +55,11 @@ SYSTEM_HOST_LDFLAGS="" LIB_SDL_NAME="Simple DirectMedia Layer" case "$HOST_SYSTEM" in Darwin) - LIB_SDL_CFLAGS='' - LIB_SDL_LDFLAGS='-framework SDL -framework Cocoa -lobjc' + LIB_SDL_CFLAGS='-F/Library/Frameworks/ -framework SDL' + LIB_SDL_LDFLAGS='-F/Library/Frameworks/ -framework SDL -framework Cocoa -lobjc' LIB_SDL_VERSION=$(echo \ "SDL_MAJOR_VERSION.SDL_MINOR_VERSION.SDL_PATCHLEVEL" | \ - gcc -E -include SDL/SDL_version.h $LIB_SDL_CFLAGS - | \ + gcc -E $SYSTEM_HOST_CFLAGS $LIB_SDL_CFLAGS -include SDL/SDL_version.h $LIB_SDL_LDFLAGS - | \ tail -1 | tr -d ' ') ;; WINSCW|GCCE) @@ -94,7 +94,7 @@ LIB_SDL_mixer_VERSION="" LIB_SDL_image_NAME="SDL_image" case "$HOST_SYSTEM" in Darwin) - LIB_SDL_image_CFLAGS='' + LIB_SDL_image_CFLAGS='-framework SDL_image' LIB_SDL_image_LDFLAGS="-framework SDL_image" ;; ARMV5|WINSCW|GCCE)