From: divverent Date: Sat, 15 Dec 2007 14:53:43 +0000 (+0000) Subject: changed DP_MODPLUG_STATIC_PREFIX to DP_MODPLUG_STATIC_LIBDIR (so it works on Fedora... X-Git-Tag: xonotic-v0.1.0preview~2689 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=38d9130949ea0f42857c3a57929d24c702edcc4c;p=xonotic%2Fdarkplaces.git changed DP_MODPLUG_STATIC_PREFIX to DP_MODPLUG_STATIC_LIBDIR (so it works on Fedora too, which has libs in /usr/lib64 instead). Now append the /lib or /lib64 to the path too. Includes are assumed to be in ../include relative to the LIBDIR given, but are also searched in any other usual -I path. git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@7801 d7cf8633-e32d-0410-b094-e92efae38249 --- diff --git a/makefile.inc b/makefile.inc index 47cbc8e1..126dad00 100644 --- a/makefile.inc +++ b/makefile.inc @@ -31,8 +31,8 @@ STRIP?=strip OBJ_SND_COMMON=snd_main.o snd_mem.o snd_mix.o snd_ogg.o snd_wav.o snd_modplug.o # Additional stuff for libmodplug -LIB_SND_MODPLUG=`if [ -n "$(DP_MODPLUG_STATIC_PREFIX)" ]; then echo " $(DP_MODPLUG_STATIC_PREFIX)/lib/libmodplug.a -lstdc++"; fi` -CFLAGS_SND_MODPLUG=`if [ -n "$(DP_MODPLUG_STATIC_PREFIX)" ]; then echo " -I$(DP_MODPLUG_STATIC_PREFIX)/include -DSND_MODPLUG_STATIC"; fi` +LIB_SND_MODPLUG=`if [ -n "$(DP_MODPLUG_STATIC_LIBDIR)" ]; then echo " $(DP_MODPLUG_STATIC_LIBDIR)/libmodplug.a -lstdc++"; fi` +CFLAGS_SND_MODPLUG=`if [ -n "$(DP_MODPLUG_STATIC_LIBDIR)" ]; then echo " -I$(DP_MODPLUG_STATIC_LIBDIR)/../include -DSND_MODPLUG_STATIC"; fi` # No sound OBJ_SND_NULL=snd_null.o