From: havoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Thu, 24 Dec 2009 16:21:11 +0000 (+0000)
Subject: changed Cg shader support to check DP_CG_LIBDIR instead of trying to
X-Git-Tag: xonotic-v0.1.0preview~974
X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=commitdiff_plain;h=4b3ae31d761f8a6d1eaa84c248bd8e37c74fbb85

changed Cg shader support to check DP_CG_LIBDIR instead of trying to
detect /usr/lib


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

diff --git a/makefile.inc b/makefile.inc
index 30e41b3c..5808b22d 100644
--- a/makefile.inc
+++ b/makefile.inc
@@ -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