Fixed bug 1410 - fatbuild.sh is broken
authorSam Lantinga
Sat, 04 Feb 2012 10:40:04 -0500
changeset 6276b696a93d2848
parent 6275 963497e37d34
child 6277 60a0e02107f9
Fixed bug 1410 - fatbuild.sh is broken

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.
build-scripts/fatbuild.sh
     1.1 --- a/build-scripts/fatbuild.sh	Fri Feb 03 22:24:33 2012 -0500
     1.2 +++ b/build-scripts/fatbuild.sh	Sat Feb 04 10:40:04 2012 -0500
     1.3 @@ -214,12 +214,12 @@
     1.4      cd build
     1.5      target=`find . -mindepth 4 -maxdepth 4 -type f -name '*.dylib' | head -1 | sed 's|.*/||'`
     1.6      (lipo -create -o $output/$target `find . -mindepth 4 -maxdepth 4 -type f -name "*.dylib"` &&
     1.7 -     ln -sf $target $output/libSDL.dylib &&
     1.8 -     lipo -create -o $output/libSDL.a */build/.libs/libSDL.a &&
     1.9 -     cp $native_path/build/.libs/libSDL.la $output &&
    1.10 -     cp $native_path/build/.libs/libSDL.lai $output &&
    1.11 -     cp $native_path/build/libSDL.la . &&
    1.12 -     lipo -create -o libSDLmain.a */build/libSDLmain.a &&
    1.13 +     ln -sf $target $output/libSDL2.dylib &&
    1.14 +     lipo -create -o $output/libSDL2.a */build/.libs/libSDL2.a &&
    1.15 +     cp $native_path/build/.libs/libSDL2.la $output &&
    1.16 +     cp $native_path/build/.libs/libSDL2.lai $output &&
    1.17 +     cp $native_path/build/libSDL2.la . &&
    1.18 +     lipo -create -o libSDL2main.a */build/libSDL2main.a &&
    1.19       echo "Build complete!" &&
    1.20       echo "Files can be found in the build directory.") || exit 4
    1.21      cd ..
    1.22 @@ -256,25 +256,25 @@
    1.23  fi
    1.24  if test x$install_bin = xyes; then
    1.25      do_install sh $auxdir/mkinstalldirs $bindir
    1.26 -    do_install /usr/bin/install -c -m 755 build/$native_path/sdl-config $bindir/sdl-config
    1.27 +    do_install /usr/bin/install -c -m 755 build/$native_path/sdl2-config $bindir/sdl2-config
    1.28  fi
    1.29  if test x$install_hdrs = xyes; then
    1.30 -    do_install sh $auxdir/mkinstalldirs $includedir/SDL
    1.31 +    do_install sh $auxdir/mkinstalldirs $includedir/SDL2
    1.32      for src in $srcdir/include/*.h; do \
    1.33          file=`echo $src | sed -e 's|^.*/||'`; \
    1.34 -        do_install /usr/bin/install -c -m 644 $src $includedir/SDL/$file; \
    1.35 +        do_install /usr/bin/install -c -m 644 $src $includedir/SDL2/$file; \
    1.36      done
    1.37 -    do_install /usr/bin/install -c -m 644 $srcdir/include/SDL_config_macosx.h $includedir/SDL/SDL_config.h
    1.38 +    do_install /usr/bin/install -c -m 644 $srcdir/include/SDL_config_macosx.h $includedir/SDL2/SDL_config.h
    1.39  fi
    1.40  if test x$install_lib = xyes; then
    1.41      do_install sh $auxdir/mkinstalldirs $libdir
    1.42 -    do_install sh build/$native_path/libtool --mode=install /usr/bin/install -c  build/libSDL.la $libdir/libSDL.la
    1.43 -    do_install /usr/bin/install -c -m 644 build/libSDLmain.a $libdir/libSDLmain.a
    1.44 -    do_install ranlib $libdir/libSDLmain.a
    1.45 +    do_install sh build/$native_path/libtool --mode=install /usr/bin/install -c  build/libSDL2.la $libdir/libSDL2.la
    1.46 +    do_install /usr/bin/install -c -m 644 build/libSDL2main.a $libdir/libSDL2main.a
    1.47 +    do_install ranlib $libdir/libSDL2main.a
    1.48  fi
    1.49  if test x$install_data = xyes; then
    1.50      do_install sh $auxdir/mkinstalldirs $datadir/aclocal
    1.51 -    do_install /usr/bin/install -c -m 644 $srcdir/sdl.m4 $datadir/aclocal/sdl.m4
    1.52 +    do_install /usr/bin/install -c -m 644 $srcdir/sdl2.m4 $datadir/aclocal/sdl2.m4
    1.53  fi
    1.54  
    1.55  #