fly/flightgear
1
0
Fork 0
Code Activity

Martin Spott:

Browse source 
Remove all dependencies of plib's SL sound library.
This commit is contained in:
ehofman 2005-01-24 10:17:14 +00:00
parent 453e3963d9
commit 91cb15d9b0
4 changed files with 9 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
configure.ac
View file

@ -147,27 +147,14 @@ if test "$have_timezone" = yes; then
AC_DEFINE([HAVE_TIMEZONE], 1, [Define if system has timezone variable]) AC_DEFINE([HAVE_TIMEZONE], 1, [Define if system has timezone variable])
fi fi
dnl add correct audio libs and configure for audio support
LIBS="-lplibsl -lplibsm"
dnl add joystick support libraries
dnl search for FreeBSD library dnl search for FreeBSD library
AC_SEARCH_LIBS(hid_init, usbhid) AC_SEARCH_LIBS(hid_init, usbhid)
joystick_LIBS="$LIBS"
case "${host}" in
*-*-cygwin* | *-*-mingw32*)
LIBS="$LIBS -lwinmm"
;;
*-apple-darwin*)
LIBS="$LIBS -framework IOKit -framework CoreFoundation"
;;
*-*-irix* )
LIBS="$LIBS -laudio"
;;
esac
audio_LIBS="$LIBS"
LIBS="" LIBS=""
AC_SUBST(audio_LIBS) AC_SUBST(joystick_LIBS)
dnl ENABLE_AUDIO_SUPPORT could be depricated at any time in favor of dnl ENABLE_AUDIO_SUPPORT could be depricated at any time in favor of
dnl just assuming we have audio support on all platform. We can dnl just assuming we have audio support on all platform. We can
@ -298,10 +285,7 @@ case "${host}" in
esac esac
opengl_LIBS="$LIBS" opengl_LIBS="$LIBS"
LIBS="$base_LIBS" LIBS="$base_LIBS $joystick_LIBS"
dnl search for FreeBSD library
AC_SEARCH_LIBS(hid_init, usbhid)
dnl check for OpenAL libraries dnl check for OpenAL libraries
case "${host}" in case "${host}" in

4
src/Input/Makefile.am
View file

@ -6,10 +6,10 @@ bin_PROGRAMS = js_demo fgjs
js_demo_SOURCES = js_demo.cxx js_demo_SOURCES = js_demo.cxx
js_demo_LDADD = -lplibjs $(base_LIBS) $(audio_LIBS) -lplibul js_demo_LDADD = -lplibjs $(base_LIBS) $(joystick_LIBS) -lplibul
fgjs_SOURCES = fgjs.cxx jsinput.cxx jsinput.h jssuper.cxx jssuper.h fgjs_SOURCES = fgjs.cxx jsinput.cxx jsinput.h jssuper.cxx jssuper.h
fgjs_LDADD = -lplibjs $(base_LIBS) $(audio_LIBS) -lplibul fgjs_LDADD = -lplibjs $(base_LIBS) $(joystick_LIBS) -lplibul
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src

2
utils/Modeller/Makefile.am
View file

@ -1,7 +1,7 @@
noinst_PROGRAMS = threedconvert animassist normalmap noinst_PROGRAMS = threedconvert animassist normalmap
threedconvert_SOURCES = 3dconvert.cxx threedconvert_SOURCES = 3dconvert.cxx
threedconvert_LDADD = -lplibssg -lplibsg -lplibul $(opengl_LIBS) $(audio_LIBS) threedconvert_LDADD = -lplibssg -lplibsg -lplibul $(opengl_LIBS) $(joystick_LIBS)
animassist_SOURCES = animassist.c animassist_SOURCES = animassist.c
animassist_LDADD = $(base_LIBS) animassist_LDADD = $(base_LIBS)

2
utils/js_server/Makefile.am
View file

@ -1,4 +1,4 @@
sbin_PROGRAMS = js_server sbin_PROGRAMS = js_server
js_server_SOURCES = js_server.cxx js_server_SOURCES = js_server.cxx
js_server_LDADD = -lplibjs -lplibnet -lplibul $(base_LIBS) $(audio_LIBS) $(network_LIBS) js_server_LDADD = -lplibjs -lplibnet -lplibul $(base_LIBS) $(joystick_LIBS) $(network_LIBS)