From b9bddf9e90aad64a237dbbb29342b6bd66a92bcc Mon Sep 17 00:00:00 2001 From: Thomas Grill Date: Fri, 4 Jan 2008 11:59:00 +0000 Subject: compilation fixes for Python 2.5, OSX cross-platform fixes more cross-platform and version fixes compilation fixes for Python 2.5 svn path=/trunk/; revision=9122 --- externals/grill/py/build/config-mac.def | 3 +++ externals/grill/py/build/gnumake-mac-gcc.inc | 5 +++-- 2 files changed, 6 insertions(+), 2 deletions(-) (limited to 'externals/grill/py/build') diff --git a/externals/grill/py/build/config-mac.def b/externals/grill/py/build/config-mac.def index 43f31fa6..3ecd7219 100644 --- a/externals/grill/py/build/config-mac.def +++ b/externals/grill/py/build/config-mac.def @@ -1,3 +1,6 @@ +# which major python version? +PYTHONVER=23 + # uncomment if numpy/numarray/numeric support should be compiled in # for info see http://numeric.scipy.org PY_NUMPY=1 diff --git a/externals/grill/py/build/gnumake-mac-gcc.inc b/externals/grill/py/build/gnumake-mac-gcc.inc index 775a8762..d077c84e 100644 --- a/externals/grill/py/build/gnumake-mac-gcc.inc +++ b/externals/grill/py/build/gnumake-mac-gcc.inc @@ -1,12 +1,13 @@ DEFS += -DPY_EXPORTS -LIBS += -framework Python +LIBS += -F/Library/Frameworks -framework Python ifdef PY_NUMARRAY DEFS += -DPY_NUMARRAY endif ifdef PY_NUMPY DEFS += -DPY_NUMPY -INCPATH += -I/Library/Python/2.3/site-packages/numpy/core/include +INCPATH += -I/Library/Frameworks/Python.framework/Versions/2.5/lib/python2.5/site-packages/numpy/core/include +#INCPATH += -F/System/Library/Frameworks -I/Library/Python/2.3/site-packages/numpy/core/include endif ifdef PY_NUMERIC DEFS += -DPY_NUMERIC -- cgit v1.2.1