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

Fixed static linking on MacOS X (thanks Max!)

Browse source 
--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%40808
This commit is contained in:
Sam Lantinga 2004-02-11 07:09:11 +00:00
parent f183cb88cf
commit cd10cd4c74
2 changed files with 13 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

12
configure.in
View file

@ -2592,6 +2592,17 @@ case "$ARCH" in
;; ;;
esac esac
case "$ARCH" in
macosx)
# Evil hack to allow static linking on Mac OS X
SDL_STATIC_LIBS="\${exec_prefix}/lib/libSDLmain.a \${exec_prefix}/lib/libSDL.a"
;;
*)
SDL_STATIC_LIBS="$SDL_LIBS"
;;
esac
STATIC_SYSTEM_LIBS="$SYSTEM_LIBS" STATIC_SYSTEM_LIBS="$SYSTEM_LIBS"
dnl Output the video drivers we use dnl Output the video drivers we use
@ -2614,6 +2625,7 @@ AC_SUBST(SDL_EXTRALIBS)
dnl Expand the cflags and libraries needed by apps using SDL dnl Expand the cflags and libraries needed by apps using SDL
AC_SUBST(SDL_CFLAGS) AC_SUBST(SDL_CFLAGS)
AC_SUBST(SDL_LIBS) AC_SUBST(SDL_LIBS)
AC_SUBST(SDL_STATIC_LIBS)
AC_SUBST(SDL_RLD_FLAGS) AC_SUBST(SDL_RLD_FLAGS)
dnl Expand the libraries needed for static and dynamic linking dnl Expand the libraries needed for static and dynamic linking

2
sdl-config.in
View file

@ -57,7 +57,7 @@ while test $# -gt 0; do
@ENABLE_STATIC_TRUE@@ENABLE_SHARED_TRUE@ --static-libs) @ENABLE_STATIC_TRUE@@ENABLE_SHARED_TRUE@ --static-libs)
@ENABLE_STATIC_TRUE@@ENABLE_SHARED_FALSE@ --libs|--static-libs) @ENABLE_STATIC_TRUE@@ENABLE_SHARED_FALSE@ --libs|--static-libs)
@ENABLE_STATIC_TRUE@ libdirs="-L@libdir@ @SDL_RLD_FLAGS@" @ENABLE_STATIC_TRUE@ libdirs="-L@libdir@ @SDL_RLD_FLAGS@"
@ENABLE_STATIC_TRUE@ echo $libdirs @SDL_LIBS@ @STATIC_SYSTEM_LIBS@ @ENABLE_STATIC_TRUE@ echo $libdirs @SDL_STATIC_LIBS@ @STATIC_SYSTEM_LIBS@
@ENABLE_STATIC_TRUE@ ;; @ENABLE_STATIC_TRUE@ ;;
*) *)
echo "${usage}" 1>&2 echo "${usage}" 1>&2