Fixed bug 1429 - Compiling static library with -arch fails when linking showimage
authorSam Lantinga
Tue, 28 Feb 2012 21:58:36 -0500
changeset 63036bb657898f55
parent 6302 b0ae93a5b8d6
child 6304 9821f5c9b7bd
Fixed bug 1429 - Compiling static library with -arch fails when linking showimage

We no longer need this ancient hack and it's causing problems when building shared libraries against SDL.
configure
configure.in
     1.1 --- a/configure	Sat Feb 04 00:13:21 2012 +1300
     1.2 +++ b/configure	Tue Feb 28 21:58:36 2012 -0500
     1.3 @@ -27900,15 +27900,7 @@
     1.4    SDL_RLD_FLAGS=""
     1.5  fi
     1.6  
     1.7 -case "$ARCH" in
     1.8 -  macosx)
     1.9 -    # Evil hack to allow static linking on Mac OS X
    1.10 -    SDL_STATIC_LIBS="\${libdir}/libSDL2.a $EXTRA_LDFLAGS"
    1.11 -    ;;
    1.12 -  *)
    1.13 -    SDL_STATIC_LIBS="$SDL_LIBS $EXTRA_LDFLAGS"
    1.14 -    ;;
    1.15 -esac
    1.16 +SDL_STATIC_LIBS="$SDL_LIBS $EXTRA_LDFLAGS"
    1.17  
    1.18  
    1.19  
     2.1 --- a/configure.in	Sat Feb 04 00:13:21 2012 +1300
     2.2 +++ b/configure.in	Tue Feb 28 21:58:36 2012 -0500
     2.3 @@ -2559,15 +2559,7 @@
     2.4    SDL_RLD_FLAGS=""
     2.5  fi
     2.6  
     2.7 -case "$ARCH" in
     2.8 -  macosx)
     2.9 -    # Evil hack to allow static linking on Mac OS X
    2.10 -    SDL_STATIC_LIBS="\${libdir}/libSDL2.a $EXTRA_LDFLAGS"
    2.11 -    ;;
    2.12 -  *)
    2.13 -    SDL_STATIC_LIBS="$SDL_LIBS $EXTRA_LDFLAGS"
    2.14 -    ;;
    2.15 -esac
    2.16 +SDL_STATIC_LIBS="$SDL_LIBS $EXTRA_LDFLAGS"
    2.17  
    2.18  dnl Expand the cflags and libraries needed by apps using SDL
    2.19  AC_SUBST(SDL_CFLAGS)