pandory500/SDL-mirror
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed bug 1410 - fatbuild.sh is broken

Browse source 
Martin Gerhardy 2012-02-03 23:04:45 PST

after the name change from SDL to SDL2 the fatbuild.sh got broken. The attached
patch should fix this.
This commit is contained in:
Sam Lantinga 2012-02-04 10:40:04 -05:00
parent 4c9a5c130f
commit 3ed5d99c40
1 changed files with 14 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

28
build-scripts/fatbuild.sh
View file

@ -214,12 +214,12 @@ if test x$merge = xyes; then
cd build cd build
target=`find . -mindepth 4 -maxdepth 4 -type f -name '*.dylib' | head -1 | sed 's|.*/||'` target=`find . -mindepth 4 -maxdepth 4 -type f -name '*.dylib' | head -1 | sed 's|.*/||'`
(lipo -create -o $output/$target `find . -mindepth 4 -maxdepth 4 -type f -name "*.dylib"` && (lipo -create -o $output/$target `find . -mindepth 4 -maxdepth 4 -type f -name "*.dylib"` &&
ln -sf $target $output/libSDL.dylib && ln -sf $target $output/libSDL2.dylib &&
lipo -create -o $output/libSDL.a */build/.libs/libSDL.a && lipo -create -o $output/libSDL2.a */build/.libs/libSDL2.a &&
cp $native_path/build/.libs/libSDL.la $output && cp $native_path/build/.libs/libSDL2.la $output &&
cp $native_path/build/.libs/libSDL.lai $output && cp $native_path/build/.libs/libSDL2.lai $output &&
cp $native_path/build/libSDL.la . && cp $native_path/build/libSDL2.la . &&
lipo -create -o libSDLmain.a */build/libSDLmain.a && lipo -create -o libSDL2main.a */build/libSDL2main.a &&
echo "Build complete!" && echo "Build complete!" &&
echo "Files can be found in the build directory.") || exit 4 echo "Files can be found in the build directory.") || exit 4
cd .. cd ..
@ -256,25 +256,25 @@ if test x$mandir = x; then
fi fi
if test x$install_bin = xyes; then if test x$install_bin = xyes; then
do_install sh $auxdir/mkinstalldirs $bindir do_install sh $auxdir/mkinstalldirs $bindir
do_install /usr/bin/install -c -m 755 build/$native_path/sdl-config $bindir/sdl-config do_install /usr/bin/install -c -m 755 build/$native_path/sdl2-config $bindir/sdl2-config
fi fi
if test x$install_hdrs = xyes; then if test x$install_hdrs = xyes; then
do_install sh $auxdir/mkinstalldirs $includedir/SDL do_install sh $auxdir/mkinstalldirs $includedir/SDL2
for src in $srcdir/include/*.h; do \ for src in $srcdir/include/*.h; do \
file=`echo $src | sed -e 's|^.*/||'`; \ file=`echo $src | sed -e 's|^.*/||'`; \
do_install /usr/bin/install -c -m 644 $src $includedir/SDL/$file; \ do_install /usr/bin/install -c -m 644 $src $includedir/SDL2/$file; \
done done
do_install /usr/bin/install -c -m 644 $srcdir/include/SDL_config_macosx.h $includedir/SDL/SDL_config.h do_install /usr/bin/install -c -m 644 $srcdir/include/SDL_config_macosx.h $includedir/SDL2/SDL_config.h
fi fi
if test x$install_lib = xyes; then if test x$install_lib = xyes; then
do_install sh $auxdir/mkinstalldirs $libdir do_install sh $auxdir/mkinstalldirs $libdir
do_install sh build/$native_path/libtool --mode=install /usr/bin/install -c build/libSDL.la $libdir/libSDL.la do_install sh build/$native_path/libtool --mode=install /usr/bin/install -c build/libSDL2.la $libdir/libSDL2.la
do_install /usr/bin/install -c -m 644 build/libSDLmain.a $libdir/libSDLmain.a do_install /usr/bin/install -c -m 644 build/libSDL2main.a $libdir/libSDL2main.a
do_install ranlib $libdir/libSDLmain.a do_install ranlib $libdir/libSDL2main.a
fi fi
if test x$install_data = xyes; then if test x$install_data = xyes; then
do_install sh $auxdir/mkinstalldirs $datadir/aclocal do_install sh $auxdir/mkinstalldirs $datadir/aclocal
do_install /usr/bin/install -c -m 644 $srcdir/sdl.m4 $datadir/aclocal/sdl.m4 do_install /usr/bin/install -c -m 644 $srcdir/sdl2.m4 $datadir/aclocal/sdl2.m4
fi fi
# #