1.1 --- a/build-scripts/fatbuild.sh Wed May 10 04:05:46 2006 +0000
1.2 +++ b/build-scripts/fatbuild.sh Wed May 10 05:17:58 2006 +0000
1.3 @@ -10,7 +10,12 @@
1.4 # Generic, cross-platform CFLAGS you always want go here.
1.5 CFLAGS="-O3 -g -pipe"
1.6
1.7 -# PowerPC compiler flags (10.2 runtime compatibility)
1.8 +# PowerPC configure flags (10.2 runtime compatibility)
1.9 +# We dynamically load X11, so using the system X11 headers is fine.
1.10 +CONFIG_PPC="--build=`uname -p`-apple-darwin --host=powerpc-apple-darwin \
1.11 +--x-includes=/usr/X11R6/include --x-libraries=/usr/X11R6/lib"
1.12 +
1.13 +# PowerPC compiler flags
1.14 CC_PPC="gcc-3.3 -arch ppc"
1.15 CXX_PPC="g++-3.3 -arch ppc"
1.16 CFLAGS_PPC=""
1.17 @@ -26,7 +31,12 @@
1.18 -F/Developer/SDKs/MacOSX10.2.8.sdk/System/Library/Frameworks \
1.19 -Wl,-syslibroot,/Developer/SDKs/MacOSX10.2.8.sdk"
1.20
1.21 -# Intel compiler flags (10.4 runtime compatibility)
1.22 +# Intel configure flags (10.4 runtime compatibility)
1.23 +# We dynamically load X11, so using the system X11 headers is fine.
1.24 +CONFIG_X86="--build=`uname -p`-apple-darwin --host=i386-apple-darwin \
1.25 +--x-includes=/usr/X11R6/include --x-libraries=/usr/X11R6/lib"
1.26 +
1.27 +# Intel compiler flags
1.28 CC_X86="gcc-4.0 -arch i386"
1.29 CXX_X86="g++-4.0 -arch i386"
1.30 CFLAGS_X86="-mmacosx-version-min=10.4"
1.31 @@ -158,7 +168,7 @@
1.32 #
1.33 if test x$configure_ppc = xyes; then
1.34 (cd build/ppc && \
1.35 - sh ../../configure --build=`uname -p`-apple-darwin --host=powerpc-apple-darwin CC="$CC_PPC" CXX="$CXX_PPC" CFLAGS="$CFLAGS $CFLAGS_PPC" CPPFLAGS="$CPPFLAGS_PPC" LDFLAGS="$LFLAGS_PPC") || exit 2
1.36 + sh ../../configure $CONFIG_PPC CC="$CC_PPC" CXX="$CXX_PPC" CFLAGS="$CFLAGS $CFLAGS_PPC" CPPFLAGS="$CPPFLAGS_PPC" LDFLAGS="$LFLAGS_PPC") || exit 2
1.37 fi
1.38 if test x$make_ppc = xyes; then
1.39 (cd build/ppc && ls include && make -j$NJOB) || exit 3
1.40 @@ -169,7 +179,7 @@
1.41 #
1.42 if test x$configure_x86 = xyes; then
1.43 (cd build/x86 && \
1.44 - sh ../../configure --build=`uname -p`-apple-darwin --host=i386-apple-darwin CC="$CC_X86" CXX="$CXX_X86" CFLAGS="$CFLAGS $CFLAGS_X86" CPPFLAGS="$CPPFLAGS_X86" LDFLAGS="$LFLAGS_X86") || exit 2
1.45 + sh ../../configure $CONFIG_X86 CC="$CC_X86" CXX="$CXX_X86" CFLAGS="$CFLAGS $CFLAGS_X86" CPPFLAGS="$CPPFLAGS_X86" LDFLAGS="$LFLAGS_X86") || exit 2
1.46 fi
1.47 if test x$make_x86 = xyes; then
1.48 (cd build/x86 && make -j$NJOB) || exit 3
2.1 --- a/configure.in Wed May 10 04:05:46 2006 +0000
2.2 +++ b/configure.in Wed May 10 05:17:58 2006 +0000
2.3 @@ -833,6 +833,8 @@
2.4 if test x$ac_cv_func_shmat != xyes; then
2.5 X_CFLAGS="$X_CFLAGS -DNO_SHARED_MEMORY"
2.6 fi
2.7 + CFLAGS="$CFLAGS $X_CFLAGS"
2.8 + LDFLAGS="$LDFLAGS $X_LIBS"
2.9
2.10 AC_DEFINE(SDL_VIDEO_DRIVER_X11)
2.11 SOURCES="$SOURCES $srcdir/src/video/x11/*.c"