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

EXTRA_LDFLAGS are the linker flags and libraries needed to build SDL.

Browse source 
SDL_LIBS are the linker flags and libraries needed to build SDL applications.
SDL_STATIC_LIBS is set to SDL_LIBS by default.

--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%401552
This commit is contained in:
Sam Lantinga 2006-03-18 18:41:59 +00:00
parent dbce258f24
commit d6d98ddcc5
2 changed files with 5 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

30
configure.in
View file

@ -2306,8 +2306,6 @@ case "$target" in
fi fi
have_timers=yes have_timers=yes
fi fi
# Now set libraries needed in sdl-config
SYSTEM_LIBS="$EXTRA_LDFLAGS"
;; ;;
*-riscos) *-riscos)
ARCH=riscos ARCH=riscos
@ -2401,31 +2399,16 @@ else
fi fi
case "$ARCH" in case "$ARCH" in
openbsd | netbsd | bsdi)
SHARED_SYSTEM_LIBS="$SYSTEM_LIBS"
;;
qnx)
SHARED_SYSTEM_LIBS="$SYSTEM_LIBS"
;;
macosx) macosx)
SHARED_SYSTEM_LIBS=""
if test x$enable_video = xyes -a x$enable_video_cocoa = xyes; then if test x$enable_video = xyes -a x$enable_video_cocoa = xyes; then
SHARED_SYSTEM_LIBS="$SHARED_SYSTEM_LIBS -framework Cocoa" SDL_LIBS="$SDL_LIBS -framework Cocoa"
fi fi
if test x$enable_video = xyes -a x$enable_video_carbon = xyes; then if test x$enable_video = xyes -a x$enable_video_carbon = xyes; then
SHARED_SYSTEM_LIBS="$SHARED_SYSTEM_LIBS -framework Carbon" SDL_LIBS="$SDL_LIBS -framework Carbon"
fi fi
if test x$enable_video = xyes -a x$enable_video_opengl = xyes; then if test x$enable_video = xyes -a x$enable_video_opengl = xyes; then
SHARED_SYSTEM_LIBS="$SHARED_SYSTEM_LIBS -framework OpenGL" SDL_LIBS="$SDL_LIBS -framework OpenGL"
fi fi
;;
*)
SHARED_SYSTEM_LIBS=""
;;
esac
case "$ARCH" in
macosx)
# Evil hack to allow static linking on Mac OS X # 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"
;; ;;
@ -2434,8 +2417,6 @@ case "$ARCH" in
;; ;;
esac esac
STATIC_SYSTEM_LIBS="$SYSTEM_LIBS"
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)
@ -2460,11 +2441,6 @@ AC_SUBST(ENABLE_SHARED_FALSE)
AC_SUBST(ENABLE_STATIC_TRUE) AC_SUBST(ENABLE_STATIC_TRUE)
AC_SUBST(ENABLE_STATIC_FALSE) AC_SUBST(ENABLE_STATIC_FALSE)
dnl Expand the libraries needed for static and dynamic linking
AC_SUBST(STATIC_SYSTEM_LIBS)
AC_SUBST(SHARED_SYSTEM_LIBS)
AC_SUBST(SYSTEM_LIBS)
dnl Expand the sources and objects needed to build the library dnl Expand the sources and objects needed to build the library
AC_SUBST(ac_aux_dir) AC_SUBST(ac_aux_dir)
AC_SUBST(INCLUDE) AC_SUBST(INCLUDE)

6
sdl-config.in
View file

@ -42,13 +42,11 @@ while test $# -gt 0; do
echo -I@includedir@/SDL @SDL_CFLAGS@ echo -I@includedir@/SDL @SDL_CFLAGS@
;; ;;
@ENABLE_SHARED_TRUE@ --libs) @ENABLE_SHARED_TRUE@ --libs)
@ENABLE_SHARED_TRUE@ libdirs="-L@libdir@ @SDL_RLD_FLAGS@" @ENABLE_SHARED_TRUE@ echo -L@libdir@ @SDL_RLD_FLAGS@ @SDL_LIBS@
@ENABLE_SHARED_TRUE@ echo $libdirs @SDL_LIBS@ @SHARED_SYSTEM_LIBS@
@ENABLE_SHARED_TRUE@ ;; @ENABLE_SHARED_TRUE@ ;;
@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@ echo -L@libdir@ @SDL_RLD_FLAGS@ @SDL_STATIC_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