joel16/SDL2
1
0
Fork 0
mirror of https://github.com/joel16/SDL2.git synced 2024-12-02 16:26:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed bug #192

Browse Source 
The change made to sdl-config.in on March 18 (rev 11, see
http://www.libsdl.org/cgi/cvsweb.cgi/SDL12/sdl-config.in), broke static linking
under Mac OS X for unix style build systems. In other words, "sdl-config
--static-libs" no longer produces the correct output, as it is missing the
required -framework switches.

The attached patch fixes this.

--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%401631
This commit is contained in:
Sam Lantinga 2006-04-13 13:29:00 +00:00
parent 8e0aecf6fd
commit 2cfa74d7b8
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
configure.in
View File

@ -2315,6 +2315,13 @@ case "$host" in
# just the OS X kernel sans upper layers like Carbon and Cocoa.
# Next line is broken, and a few files below require Mac OS X (full)
ARCH=macosx
# HACK: Reset EXTRA_LDFLAGS; the only thing it contains at this point is
# -lm which is not needed under Mac OS X. But for some reasons it also
# tends to contain spurious -L switches, which we don't want to use
# here or in sdl-config. Hence we reset it.
EXTRA_LDFLAGS=""
CheckDummyVideo
CheckDiskAudio
CheckDummyAudio
@ -2528,7 +2535,7 @@ case "$ARCH" in
SDL_LIBS="$SDL_LIBS -Wl,-framework,OpenGL"
fi
# 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="\${exec_prefix}/lib/libSDLmain.a \${exec_prefix}/lib/libSDL.a $EXTRA_LDFLAGS"
;;
*)
SDL_STATIC_LIBS="$SDL_LIBS"