]> git.xonotic.org Git - xonotic/darkplaces.git/commitdiff
changed Cg shader support to check DP_CG_LIBDIR instead of trying to
authorhavoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Thu, 24 Dec 2009 16:21:11 +0000 (16:21 +0000)
committerhavoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Thu, 24 Dec 2009 16:21:11 +0000 (16:21 +0000)
detect /usr/lib

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@9674 d7cf8633-e32d-0410-b094-e92efae38249

makefile.inc

index 30e41b3c119d577284de0b64e39337475f382980..5808b22de879f09b0b6362f2794aaa6818376b4c 100644 (file)
@@ -28,8 +28,8 @@ LIB_ODE=`[ -n "$(DP_ODE_STATIC_LIBDIR)" ] && "$(DP_ODE_STATIC_LIBDIR)/../bin/ode
 CFLAGS_ODE=`[ -n "$(DP_ODE_STATIC_LIBDIR)" ] && "$(DP_ODE_STATIC_LIBDIR)/../bin/ode-config" --cflags || { [ -n "$(DP_ODE_DYNAMIC)" ] && echo \ -DODE_DYNAMIC; }` `[ -n "$(DP_ODE_STATIC_LIBDIR)" ] && echo -DODE_STATIC`
 
 # Additional stuff for libCg
-LIB_CG=`[ -r "/usr/lib64/libCg.so" -o -r "/usr/lib/libCg.so" ] && echo \ -lCg\ -lCgGL -lGL`
-CFLAGS_CG=`[ -r "/usr/lib64/libCg.so" -o -r "/usr/lib/libCg.so" ] && echo \ -DSUPPORTCG`
+LIB_CG= `[ -n "$(DP_CG_LIBDIR)" ] && echo \ -lCg\ -lCgGL -lGL`
+CFLAGS_CG= `[ -n "$(DP_CG_LIBDIR)" ] && echo \ -DSUPPORTCG`
 
 
 SDL_CONFIG?=sdl-config