Remove old files from SDL external
They were already removed in SDL upstream but the update mechanism did not remove them in this repository. They were causing build failures when the SDL external was used.
This commit is contained in:
Simon Bruder
72
externals/SDL/build-scripts/config.sub.patch
vendored
72
externals/SDL/build-scripts/config.sub.patch
vendored
@@ -1,72 +0,0 @@
|
||||
--- config.sub.orig 2017-09-09 08:01:02.139023205 -0700
|
||||
+++ config.sub 2017-09-09 07:59:35.798264474 -0700
|
||||
@@ -364,6 +364,19 @@
|
||||
i*86 | x86_64)
|
||||
basic_machine=$basic_machine-pc
|
||||
;;
|
||||
+ nacl64*)
|
||||
+ basic_machine=x86_64-pc
|
||||
+ os=-nacl
|
||||
+ ;;
|
||||
+ nacl*)
|
||||
+ basic_machine=i686-pc
|
||||
+ os=-nacl
|
||||
+ ;;
|
||||
+ pnacl*)
|
||||
+ # le32-unknown-pnacl comes from http://www.chromium.org/nativeclient/pnacl/stability-of-the-pnacl-bitcode-abi
|
||||
+ basic_machine=le32-unknown
|
||||
+ os=-pnacl
|
||||
+ ;;
|
||||
# Object if more than one company name word.
|
||||
*-*-*)
|
||||
echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
|
||||
@@ -877,6 +890,10 @@
|
||||
basic_machine=le32-unknown
|
||||
os=-nacl
|
||||
;;
|
||||
+ pnacl)
|
||||
+ basic_machine=le32-unknown
|
||||
+ os=-pnacl
|
||||
+ ;;
|
||||
ncr3000)
|
||||
basic_machine=i486-ncr
|
||||
os=-sysv4
|
||||
@@ -1429,6 +1446,12 @@
|
||||
;;
|
||||
esac
|
||||
;;
|
||||
+ -nacl*)
|
||||
+ os=-nacl
|
||||
+ ;;
|
||||
+ -pnacl*)
|
||||
+ os=-pnacl
|
||||
+ ;;
|
||||
-nto-qnx*)
|
||||
;;
|
||||
-nto*)
|
||||
@@ -1459,6 +1482,9 @@
|
||||
-os400*)
|
||||
os=-os400
|
||||
;;
|
||||
+ -cegcc*)
|
||||
+ os=-cegcc
|
||||
+ ;;
|
||||
-wince*)
|
||||
os=-wince
|
||||
;;
|
||||
@@ -1548,9 +1574,15 @@
|
||||
os=-dicos
|
||||
;;
|
||||
-nacl*)
|
||||
+ os=-nacl
|
||||
+ ;;
|
||||
+ -pnacl*)
|
||||
+ os=-pnacl
|
||||
;;
|
||||
-ios)
|
||||
;;
|
||||
+ -emscripten*)
|
||||
+ ;;
|
||||
-none)
|
||||
;;
|
||||
*)
|
||||
102
externals/SDL/build-scripts/gcc-fat.sh
vendored
102
externals/SDL/build-scripts/gcc-fat.sh
vendored
@@ -1,102 +0,0 @@
|
||||
#!/bin/sh
|
||||
#
|
||||
# Build Universal binaries on Mac OS X, thanks Ryan!
|
||||
#
|
||||
# Usage: ./configure CC="sh gcc-fat.sh" && make && rm -rf x86 x64
|
||||
|
||||
DEVELOPER="`xcode-select -print-path`/Platforms/MacOSX.platform/Developer"
|
||||
|
||||
# Intel 32-bit compiler flags (10.6 runtime compatibility)
|
||||
GCC_COMPILE_X86="gcc -arch i386 -mmacosx-version-min=10.6 \
|
||||
-I/usr/local/include"
|
||||
|
||||
GCC_LINK_X86="-mmacosx-version-min=10.6"
|
||||
|
||||
# Intel 64-bit compiler flags (10.6 runtime compatibility)
|
||||
GCC_COMPILE_X64="gcc -arch x86_64 -mmacosx-version-min=10.6 \
|
||||
-DMAC_OS_X_VERSION_MIN_REQUIRED=1060 \
|
||||
-I/usr/local/include"
|
||||
|
||||
GCC_LINK_X64="-mmacosx-version-min=10.6"
|
||||
|
||||
# Output both PowerPC and Intel object files
|
||||
args="$*"
|
||||
compile=yes
|
||||
link=yes
|
||||
while test x$1 != x; do
|
||||
case $1 in
|
||||
--version) exec gcc $1;;
|
||||
-v) exec gcc $1;;
|
||||
-V) exec gcc $1;;
|
||||
-print-prog-name=*) exec gcc $1;;
|
||||
-print-search-dirs) exec gcc $1;;
|
||||
-E) GCC_COMPILE_X86="$GCC_COMPILE_X86 -E"
|
||||
GCC_COMPILE_X64="$GCC_COMPILE_X64 -E"
|
||||
compile=no; link=no;;
|
||||
-c) link=no;;
|
||||
-o) output=$2;;
|
||||
*.c|*.cc|*.cpp|*.S|*.m|*.mm) source=$1;;
|
||||
esac
|
||||
shift
|
||||
done
|
||||
if test x$link = xyes; then
|
||||
GCC_COMPILE_X86="$GCC_COMPILE_X86 $GCC_LINK_X86"
|
||||
GCC_COMPILE_X64="$GCC_COMPILE_X64 $GCC_LINK_X64"
|
||||
fi
|
||||
if test x"$output" = x; then
|
||||
if test x$link = xyes; then
|
||||
output=a.out
|
||||
elif test x$compile = xyes; then
|
||||
output=`echo $source | sed -e 's|.*/||' -e 's|\(.*\)\.[^\.]*|\1|'`.o
|
||||
fi
|
||||
fi
|
||||
|
||||
# Compile X86 32-bit
|
||||
if test x"$output" != x; then
|
||||
dir=x86/`dirname $output`
|
||||
if test -d $dir; then
|
||||
:
|
||||
else
|
||||
mkdir -p $dir
|
||||
fi
|
||||
fi
|
||||
set -- $args
|
||||
while test x$1 != x; do
|
||||
if test -f "x86/$1" && test "$1" != "$output"; then
|
||||
x86_args="$x86_args x86/$1"
|
||||
else
|
||||
x86_args="$x86_args $1"
|
||||
fi
|
||||
shift
|
||||
done
|
||||
$GCC_COMPILE_X86 $x86_args || exit $?
|
||||
if test x"$output" != x; then
|
||||
cp $output x86/$output
|
||||
fi
|
||||
|
||||
# Compile X86 32-bit
|
||||
if test x"$output" != x; then
|
||||
dir=x64/`dirname $output`
|
||||
if test -d $dir; then
|
||||
:
|
||||
else
|
||||
mkdir -p $dir
|
||||
fi
|
||||
fi
|
||||
set -- $args
|
||||
while test x$1 != x; do
|
||||
if test -f "x64/$1" && test "$1" != "$output"; then
|
||||
x64_args="$x64_args x64/$1"
|
||||
else
|
||||
x64_args="$x64_args $1"
|
||||
fi
|
||||
shift
|
||||
done
|
||||
$GCC_COMPILE_X64 $x64_args || exit $?
|
||||
if test x"$output" != x; then
|
||||
cp $output x64/$output
|
||||
fi
|
||||
|
||||
if test x"$output" != x; then
|
||||
lipo -create -o $output x86/$output x64/$output
|
||||
fi
|
||||
190
externals/SDL/build-scripts/iosbuild.sh
vendored
190
externals/SDL/build-scripts/iosbuild.sh
vendored
@@ -1,190 +0,0 @@
|
||||
#!/bin/sh
|
||||
#
|
||||
# Build a fat binary for iOS
|
||||
|
||||
# Number of CPUs (for make -j)
|
||||
NCPU=`sysctl -n hw.ncpu`
|
||||
if test x$NJOB = x; then
|
||||
NJOB=$NCPU
|
||||
fi
|
||||
|
||||
SRC_DIR=$(cd `dirname $0`/..; pwd)
|
||||
if [ "$PWD" = "$SRC_DIR" ]; then
|
||||
PREFIX=$SRC_DIR/ios-build
|
||||
if [ ! -d "$PREFIX" ]; then
|
||||
mkdir $PREFIX
|
||||
fi
|
||||
else
|
||||
PREFIX=$PWD
|
||||
fi
|
||||
|
||||
BUILD_I386_IOSSIM=YES
|
||||
BUILD_X86_64_IOSSIM=YES
|
||||
|
||||
BUILD_IOS_ARMV7=YES
|
||||
BUILD_IOS_ARMV7S=YES
|
||||
BUILD_IOS_ARM64=YES
|
||||
|
||||
# 13.4.0 - Mavericks
|
||||
# 14.0.0 - Yosemite
|
||||
# 15.0.0 - El Capitan
|
||||
DARWIN=darwin15.0.0
|
||||
|
||||
XCODEDIR=`xcode-select --print-path`
|
||||
IOS_SDK_VERSION=`xcrun --sdk iphoneos --show-sdk-version`
|
||||
MIN_SDK_VERSION=6.0
|
||||
|
||||
IPHONEOS_PLATFORM=`xcrun --sdk iphoneos --show-sdk-platform-path`
|
||||
IPHONEOS_SYSROOT=`xcrun --sdk iphoneos --show-sdk-path`
|
||||
|
||||
IPHONESIMULATOR_PLATFORM=`xcrun --sdk iphonesimulator --show-sdk-platform-path`
|
||||
IPHONESIMULATOR_SYSROOT=`xcrun --sdk iphonesimulator --show-sdk-path`
|
||||
|
||||
# Uncomment if you want to see more information about each invocation
|
||||
# of clang as the builds proceed.
|
||||
# CLANG_VERBOSE="--verbose"
|
||||
|
||||
CC=clang
|
||||
CXX=clang
|
||||
|
||||
SILENCED_WARNINGS="-Wno-unused-local-typedef -Wno-unused-function"
|
||||
|
||||
CFLAGS="${CLANG_VERBOSE} ${SILENCED_WARNINGS} -DNDEBUG -g -O0 -pipe -fPIC -fobjc-arc"
|
||||
|
||||
echo "PREFIX ..................... ${PREFIX}"
|
||||
echo "BUILD_MACOSX_X86_64 ........ ${BUILD_MACOSX_X86_64}"
|
||||
echo "BUILD_I386_IOSSIM .......... ${BUILD_I386_IOSSIM}"
|
||||
echo "BUILD_X86_64_IOSSIM ........ ${BUILD_X86_64_IOSSIM}"
|
||||
echo "BUILD_IOS_ARMV7 ............ ${BUILD_IOS_ARMV7}"
|
||||
echo "BUILD_IOS_ARMV7S ........... ${BUILD_IOS_ARMV7S}"
|
||||
echo "BUILD_IOS_ARM64 ............ ${BUILD_IOS_ARM64}"
|
||||
echo "DARWIN ..................... ${DARWIN}"
|
||||
echo "XCODEDIR ................... ${XCODEDIR}"
|
||||
echo "IOS_SDK_VERSION ............ ${IOS_SDK_VERSION}"
|
||||
echo "MIN_SDK_VERSION ............ ${MIN_SDK_VERSION}"
|
||||
echo "IPHONEOS_PLATFORM .......... ${IPHONEOS_PLATFORM}"
|
||||
echo "IPHONEOS_SYSROOT ........... ${IPHONEOS_SYSROOT}"
|
||||
echo "IPHONESIMULATOR_PLATFORM ... ${IPHONESIMULATOR_PLATFORM}"
|
||||
echo "IPHONESIMULATOR_SYSROOT .... ${IPHONESIMULATOR_SYSROOT}"
|
||||
echo "CC ......................... ${CC}"
|
||||
echo "CFLAGS ..................... ${CFLAGS}"
|
||||
echo "CXX ........................ ${CXX}"
|
||||
echo "CXXFLAGS ................... ${CXXFLAGS}"
|
||||
echo "LDFLAGS .................... ${LDFLAGS}"
|
||||
|
||||
###################################################################
|
||||
# This section contains the build commands for each of the
|
||||
# architectures that will be included in the universal binaries.
|
||||
###################################################################
|
||||
|
||||
echo "$(tput setaf 2)"
|
||||
echo "###########################"
|
||||
echo "# i386 for iPhone Simulator"
|
||||
echo "###########################"
|
||||
echo "$(tput sgr0)"
|
||||
|
||||
if [ "${BUILD_I386_IOSSIM}" == "YES" ]
|
||||
then
|
||||
(
|
||||
cd ${PREFIX}
|
||||
make clean
|
||||
../configure --build=x86_64-apple-${DARWIN} --host=i386-ios-${DARWIN} --disable-shared --prefix=${PREFIX}/platform/i386-sim "CC=${CC}" "CFLAGS=${CFLAGS} -mios-simulator-version-min=${MIN_SDK_VERSION} -arch i386 -isysroot ${IPHONESIMULATOR_SYSROOT}" "CXX=${CXX}" "CXXFLAGS=${CXXFLAGS} -mios-simulator-version-min=${MIN_SDK_VERSION} -arch i386 -isysroot ${IPHONESIMULATOR_SYSROOT}" LDFLAGS="-arch i386 -mios-simulator-version-min=${MIN_SDK_VERSION} ${LDFLAGS} -L${IPHONESIMULATOR_SYSROOT}/usr/lib/ -L${IPHONESIMULATOR_SYSROOT}/usr/lib/system" || exit 2
|
||||
cp $SRC_DIR/include/SDL_config_iphoneos.h include/SDL_config.h
|
||||
make -j10 || exit 3
|
||||
make install
|
||||
) || exit $?
|
||||
fi
|
||||
|
||||
echo "$(tput setaf 2)"
|
||||
echo "#############################"
|
||||
echo "# x86_64 for iPhone Simulator"
|
||||
echo "#############################"
|
||||
echo "$(tput sgr0)"
|
||||
|
||||
if [ "${BUILD_X86_64_IOSSIM}" == "YES" ]
|
||||
then
|
||||
(
|
||||
cd ${PREFIX}
|
||||
make clean
|
||||
../configure --build=x86_64-apple-${DARWIN} --host=x86_64-ios-${DARWIN} --disable-shared --prefix=${PREFIX}/platform/x86_64-sim "CC=${CC}" "CFLAGS=${CFLAGS} -mios-simulator-version-min=${MIN_SDK_VERSION} -arch x86_64 -isysroot ${IPHONESIMULATOR_SYSROOT}" "CXX=${CXX}" "CXXFLAGS=${CXXFLAGS} -mios-simulator-version-min=${MIN_SDK_VERSION} -arch x86_64 -isysroot ${IPHONESIMULATOR_SYSROOT}" LDFLAGS="-arch x86_64 -mios-simulator-version-min=${MIN_SDK_VERSION} ${LDFLAGS} -L${IPHONESIMULATOR_SYSROOT}/usr/lib/ -L${IPHONESIMULATOR_SYSROOT}/usr/lib/system" || exit 2
|
||||
cp $SRC_DIR/include/SDL_config_iphoneos.h include/SDL_config.h
|
||||
make -j$NJOB || exit 3
|
||||
make install
|
||||
) || exit $?
|
||||
fi
|
||||
|
||||
echo "$(tput setaf 2)"
|
||||
echo "##################"
|
||||
echo "# armv7 for iPhone"
|
||||
echo "##################"
|
||||
echo "$(tput sgr0)"
|
||||
|
||||
if [ "${BUILD_IOS_ARMV7}" == "YES" ]
|
||||
then
|
||||
(
|
||||
cd ${PREFIX}
|
||||
make clean
|
||||
../configure --build=x86_64-apple-${DARWIN} --host=armv7-ios-${DARWIN} --disable-shared --prefix=${PREFIX}/platform/armv7-ios "CC=${CC}" "CFLAGS=${CFLAGS} -miphoneos-version-min=${MIN_SDK_VERSION} -arch armv7 -isysroot ${IPHONEOS_SYSROOT}" "CXX=${CXX}" "CXXFLAGS=${CXXFLAGS} -arch armv7 -isysroot ${IPHONEOS_SYSROOT}" LDFLAGS="-arch armv7 -miphoneos-version-min=${MIN_SDK_VERSION} ${LDFLAGS}" || exit 2
|
||||
cp $SRC_DIR/include/SDL_config_iphoneos.h include/SDL_config.h
|
||||
make -j$NJOB || exit 3
|
||||
make install
|
||||
) || exit $?
|
||||
fi
|
||||
|
||||
echo "$(tput setaf 2)"
|
||||
echo "###################"
|
||||
echo "# armv7s for iPhone"
|
||||
echo "###################"
|
||||
echo "$(tput sgr0)"
|
||||
|
||||
if [ "${BUILD_IOS_ARMV7S}" == "YES" ]
|
||||
then
|
||||
(
|
||||
cd ${PREFIX}
|
||||
make clean
|
||||
../configure --build=x86_64-apple-${DARWIN} --host=armv7s-ios-${DARWIN} --disable-shared --prefix=${PREFIX}/platform/armv7s-ios "CC=${CC}" "CFLAGS=${CFLAGS} -miphoneos-version-min=${MIN_SDK_VERSION} -arch armv7s -isysroot ${IPHONEOS_SYSROOT}" "CXX=${CXX}" "CXXFLAGS=${CXXFLAGS} -miphoneos-version-min=${MIN_SDK_VERSION} -arch armv7s -isysroot ${IPHONEOS_SYSROOT}" LDFLAGS="-arch armv7s -miphoneos-version-min=${MIN_SDK_VERSION} ${LDFLAGS}" || exit 2
|
||||
cp $SRC_DIR/include/SDL_config_iphoneos.h include/SDL_config.h
|
||||
make -j$NJOB || exit 3
|
||||
make install
|
||||
) || exit $?
|
||||
fi
|
||||
|
||||
echo "$(tput setaf 2)"
|
||||
echo "##################"
|
||||
echo "# arm64 for iPhone"
|
||||
echo "##################"
|
||||
echo "$(tput sgr0)"
|
||||
|
||||
if [ "${BUILD_IOS_ARM64}" == "YES" ]
|
||||
then
|
||||
(
|
||||
cd ${PREFIX}
|
||||
make clean
|
||||
../configure --build=x86_64-apple-${DARWIN} --host=arm-ios-${DARWIN} --disable-shared --prefix=${PREFIX}/platform/arm64-ios "CC=${CC}" "CFLAGS=${CFLAGS} -miphoneos-version-min=${MIN_SDK_VERSION} -arch arm64 -isysroot ${IPHONEOS_SYSROOT}" "CXX=${CXX}" "CXXFLAGS=${CXXFLAGS} -miphoneos-version-min=${MIN_SDK_VERSION} -arch arm64 -isysroot ${IPHONEOS_SYSROOT}" LDFLAGS="-arch arm64 -miphoneos-version-min=${MIN_SDK_VERSION} ${LDFLAGS}" || exit 2
|
||||
cp $SRC_DIR/include/SDL_config_iphoneos.h include/SDL_config.h
|
||||
make -j$NJOB || exit 3
|
||||
make install
|
||||
) || exit $?
|
||||
fi
|
||||
|
||||
echo "$(tput setaf 2)"
|
||||
echo "###################################################################"
|
||||
echo "# Create Universal Libraries and Finalize the packaging"
|
||||
echo "###################################################################"
|
||||
echo "$(tput sgr0)"
|
||||
|
||||
(
|
||||
cd ${PREFIX}/platform
|
||||
mkdir -p universal
|
||||
lipo x86_64-sim/lib/libSDL2.a i386-sim/lib/libSDL2.a arm64-ios/lib/libSDL2.a armv7s-ios/lib/libSDL2.a armv7-ios/lib/libSDL2.a -create -output universal/libSDL2.a
|
||||
)
|
||||
|
||||
(
|
||||
cd ${PREFIX}
|
||||
mkdir -p lib
|
||||
cp -r platform/universal/* lib
|
||||
#rm -rf platform
|
||||
lipo -info lib/libSDL2.a
|
||||
)
|
||||
|
||||
echo Done!
|
||||
Reference in New Issue
Block a user