]> git.xonotic.org Git - xonotic/darkplaces.git/commitdiff
fix detection of cg libs
authordivverent <divverent@d7cf8633-e32d-0410-b094-e92efae38249>
Wed, 23 Dec 2009 09:35:16 +0000 (09:35 +0000)
committerdivverent <divverent@d7cf8633-e32d-0410-b094-e92efae38249>
Wed, 23 Dec 2009 09:35:16 +0000 (09:35 +0000)
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@9639 d7cf8633-e32d-0410-b094-e92efae38249

makefile.inc

index 6881dbea8c90c6bf2576c4d5f66c7545f8ebfb68..4d1149006d87dd7eba7c8aab5a3f58854ef93352 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=`[ -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