Commit 9d00770a authored by Sam Lantinga's avatar Sam Lantinga

Fixed fatbuild.sh script for building on Mac OS X 10.5

The minimum PPC SDK is 10.3.9

--HG--
branch : SDL-1.2
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/branches/SDL-1.2%402656
parent 2d4548f2
...@@ -10,26 +10,26 @@ NJOB=$NCPU ...@@ -10,26 +10,26 @@ NJOB=$NCPU
# Generic, cross-platform CFLAGS you always want go here. # Generic, cross-platform CFLAGS you always want go here.
CFLAGS="-O3 -g -pipe" CFLAGS="-O3 -g -pipe"
# PowerPC configure flags (10.2 runtime compatibility) # PowerPC configure flags (10.3 runtime compatibility)
# We dynamically load X11, so using the system X11 headers is fine. # We dynamically load X11, so using the system X11 headers is fine.
CONFIG_PPC="--build=`uname -p`-apple-darwin --host=powerpc-apple-darwin \ CONFIG_PPC="--build=`uname -p`-apple-darwin --host=powerpc-apple-darwin \
--x-includes=/usr/X11R6/include --x-libraries=/usr/X11R6/lib" --x-includes=/usr/X11R6/include --x-libraries=/usr/X11R6/lib"
# PowerPC compiler flags # PowerPC compiler flags
CC_PPC="gcc-3.3 -arch ppc" CC_PPC="gcc-4.0 -arch ppc"
CXX_PPC="g++-3.3 -arch ppc" CXX_PPC="g++-4.0 -arch ppc"
CFLAGS_PPC="" CFLAGS_PPC=""
CPPFLAGS_PPC="-DMAC_OS_X_VERSION_MIN_REQUIRED=1020 \ CPPFLAGS_PPC="-DMAC_OS_X_VERSION_MIN_REQUIRED=1030 \
-nostdinc \ -nostdinc \
-F/Developer/SDKs/MacOSX10.2.8.sdk/System/Library/Frameworks \ -F/Developer/SDKs/MacOSX10.3.9.sdk/System/Library/Frameworks \
-I/Developer/SDKs/MacOSX10.2.8.sdk/usr/include/gcc/darwin/3.3 \ -I/Developer/SDKs/MacOSX10.3.9.sdk/usr/lib/gcc/powerpc-apple-darwin9/4.0.1/include \
-isystem /Developer/SDKs/MacOSX10.2.8.sdk/usr/include" -isystem /Developer/SDKs/MacOSX10.3.9.sdk/usr/include"
# PowerPC linker flags # PowerPC linker flags
LFLAGS_PPC="-arch ppc \ LFLAGS_PPC="-arch ppc -mmacosx-version-min=10.3 \
-L/Developer/SDKs/MacOSX10.2.8.sdk/usr/lib/gcc/darwin/3.3 \ -L/Developer/SDKs/MacOSX10.3.9.sdk/usr/lib/gcc/powerpc-apple-darwin9/4.0.1 \
-F/Developer/SDKs/MacOSX10.2.8.sdk/System/Library/Frameworks \ -F/Developer/SDKs/MacOSX10.3.9.sdk/System/Library/Frameworks \
-Wl,-syslibroot,/Developer/SDKs/MacOSX10.2.8.sdk" -Wl,-syslibroot,/Developer/SDKs/MacOSX10.3.9.sdk"
# Intel configure flags (10.4 runtime compatibility) # Intel configure flags (10.4 runtime compatibility)
# We dynamically load X11, so using the system X11 headers is fine. # We dynamically load X11, so using the system X11 headers is fine.
...@@ -43,12 +43,12 @@ CFLAGS_X86="-mmacosx-version-min=10.4" ...@@ -43,12 +43,12 @@ CFLAGS_X86="-mmacosx-version-min=10.4"
CPPFLAGS_X86="-DMAC_OS_X_VERSION_MIN_REQUIRED=1040 \ CPPFLAGS_X86="-DMAC_OS_X_VERSION_MIN_REQUIRED=1040 \
-nostdinc \ -nostdinc \
-F/Developer/SDKs/MacOSX10.4u.sdk/System/Library/Frameworks \ -F/Developer/SDKs/MacOSX10.4u.sdk/System/Library/Frameworks \
-I/Developer/SDKs/MacOSX10.4u.sdk/usr/lib/gcc/i686-apple-darwin8/4.0.1/include \ -I/Developer/SDKs/MacOSX10.4u.sdk/usr/lib/gcc/i686-apple-darwin9/4.0.1/include \
-isystem /Developer/SDKs/MacOSX10.4u.sdk/usr/include" -isystem /Developer/SDKs/MacOSX10.4u.sdk/usr/include"
# Intel linker flags # Intel linker flags
LFLAGS_X86="-arch i386 -mmacosx-version-min=10.4 \ LFLAGS_X86="-arch i386 -mmacosx-version-min=10.4 \
-L/Developer/SDKs/MacOSX10.4u.sdk/usr/lib/gcc/i686-apple-darwin8/4.0.1 \ -L/Developer/SDKs/MacOSX10.4u.sdk/usr/lib/gcc/i686-apple-darwin9/4.0.1 \
-Wl,-syslibroot,/Developer/SDKs/MacOSX10.4u.sdk" -Wl,-syslibroot,/Developer/SDKs/MacOSX10.4u.sdk"
# #
......
This diff is collapsed.
...@@ -39,7 +39,11 @@ ...@@ -39,7 +39,11 @@
/* The header was moved here in Mac OS X 10.1 */ /* The header was moved here in Mac OS X 10.1 */
#include <Kernel/IOKit/hidsystem/IOHIDUsageTables.h> #include <Kernel/IOKit/hidsystem/IOHIDUsageTables.h>
#endif #endif
#if MAC_OS_X_VERSION_MIN_REQUIRED == 1030
#include "10.3.9-FIX/IOHIDLib.h"
#else
#include <IOKit/hid/IOHIDLib.h> #include <IOKit/hid/IOHIDLib.h>
#endif
#include <IOKit/hid/IOHIDKeys.h> #include <IOKit/hid/IOHIDKeys.h>
#include <CoreFoundation/CoreFoundation.h> #include <CoreFoundation/CoreFoundation.h>
#include <Carbon/Carbon.h> /* for NewPtrClear, DisposePtr */ #include <Carbon/Carbon.h> /* for NewPtrClear, DisposePtr */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment