Skip to content

Commit

Permalink
Fixed static linking on MacOS X (thanks Max!)
Browse files Browse the repository at this point in the history
  • Loading branch information
slouken committed Feb 11, 2004
1 parent d17ae2a commit 3d91327
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 1 deletion.
12 changes: 12 additions & 0 deletions configure.in
Expand Up @@ -2592,6 +2592,17 @@ case "$ARCH" in
;;
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"

dnl Output the video drivers we use
Expand All @@ -2614,6 +2625,7 @@ AC_SUBST(SDL_EXTRALIBS)
dnl Expand the cflags and libraries needed by apps using SDL
AC_SUBST(SDL_CFLAGS)
AC_SUBST(SDL_LIBS)
AC_SUBST(SDL_STATIC_LIBS)
AC_SUBST(SDL_RLD_FLAGS)

dnl Expand the libraries needed for static and dynamic linking
Expand Down
2 changes: 1 addition & 1 deletion sdl-config.in
Expand Up @@ -57,7 +57,7 @@ while test $# -gt 0; do
@ENABLE_STATIC_TRUE@@ENABLE_SHARED_TRUE@ --static-libs)
@ENABLE_STATIC_TRUE@@ENABLE_SHARED_FALSE@ --libs|--static-libs)
@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@ ;;
*)
echo "${usage}" 1>&2
Expand Down

0 comments on commit 3d91327

Please sign in to comment.