From c3308337d8e84decb3d3b38b965f8d59ea496944 Mon Sep 17 00:00:00 2001 From: divverent Date: Wed, 23 Dec 2009 09:35:16 +0000 Subject: [PATCH] fix detection of cg libs git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@9639 d7cf8633-e32d-0410-b094-e92efae38249 --- makefile.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/makefile.inc b/makefile.inc index 6881dbea..4d114900 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=`[ -n "/usr/lib64/libCg.so" ] && echo \ -lCg\ -lCgGL -lGL` -CFLAGS_CG=`[ -n "/usr/lib64/libCg.so" ] && echo \ -DSUPPORTCG` +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` SDL_CONFIG?=sdl-config -- 2.39.2