From: divverent <divverent@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Mon, 26 Oct 2009 07:14:10 +0000 (+0000)
Subject: fix makefile bug of DP_ODE_STATIC_LIBDIR combined with double-precision ODE
X-Git-Tag: xonotic-v0.1.0preview~1237
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=81cdcae67566d7ff05bfa99e04c88a2b3dbcd409;p=xonotic%2Fdarkplaces.git

fix makefile bug of DP_ODE_STATIC_LIBDIR combined with double-precision ODE


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

diff --git a/makefile.inc b/makefile.inc
index 375ca404..d666be9b 100644
--- a/makefile.inc
+++ b/makefile.inc
@@ -24,8 +24,8 @@ CPUOPTIMIZATIONS?=
 # NOTE: *never* *ever* use the -ffast-math or -funsafe-math-optimizations flag
 
 # Additional stuff for libode
-LIB_ODE=`[ -n "$(DP_ODE_STATIC_LIBDIR)" ] && echo \ $(DP_ODE_STATIC_LIBDIR)/libode.a\ -lstdc++`
-CFLAGS_ODE=`[ -n "$(DP_ODE_STATIC_LIBDIR)" ] && echo \ -I$(DP_ODE_STATIC_LIBDIR)/../include\ -DODE_STATIC || { [ -n "$(DP_ODE_DYNAMIC)" ] && echo \ -DODE_DYNAMIC; }`
+LIB_ODE=`[ -n "$(DP_ODE_STATIC_LIBDIR)" ] && "$(DP_ODE_STATIC_LIBDIR)/../bin/ode-config" --libs` `[ -n "$(DP_ODE_STATIC_LIBDIR)" ] && echo -lstdc++`
+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`
 
 
 SDL_CONFIG?=sdl-config