From 6efe6563a57bc3f946deaecff67653f9d21ea99d Mon Sep 17 00:00:00 2001 From: Thomas Grill Date: Sat, 20 Jan 2007 14:27:22 +0000 Subject: fixed rich comparison method in Symbol class fix for OSX small cosmetic fixes enable compiled-only scripts (without .py) small changes for numpy support fix for numpy headers on OS X fix for numpy added xcode 2.4 project added pyext._list and pyext._tuple to convert input lists to Python sequence objects fix numpy et al enable module packages (module/__init__.py[co]), now also for Max svn path=/trunk/; revision=7370 --- externals/grill/py/build/gnumake-lnx-gcc.inc | 9 ++++++++- externals/grill/py/build/gnumake-mac-gcc.inc | 8 ++++++++ externals/grill/py/build/gnumake-win-cygwin.inc | 7 +++++++ externals/grill/py/build/nmake-win-msvc.inc | 8 ++++++++ 4 files changed, 31 insertions(+), 1 deletion(-) (limited to 'externals/grill/py/build') diff --git a/externals/grill/py/build/gnumake-lnx-gcc.inc b/externals/grill/py/build/gnumake-lnx-gcc.inc index ff0a8bfa..483bb514 100644 --- a/externals/grill/py/build/gnumake-lnx-gcc.inc +++ b/externals/grill/py/build/gnumake-lnx-gcc.inc @@ -4,4 +4,11 @@ LIBS += -lpython$(PYTHONVERSION) ifdef PY_NUMARRAY DEFS += -DPY_NUMARRAY -endif \ No newline at end of file +endif +ifdef PY_NUMPY +DEFS += -DPY_NUMPY +endif +ifdef PY_NUMERIC +DEFS += -DPY_NUMERIC +endif + diff --git a/externals/grill/py/build/gnumake-mac-gcc.inc b/externals/grill/py/build/gnumake-mac-gcc.inc index c7268557..c7080d47 100644 --- a/externals/grill/py/build/gnumake-mac-gcc.inc +++ b/externals/grill/py/build/gnumake-mac-gcc.inc @@ -4,3 +4,11 @@ LIBS += -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 +endif +ifdef PY_NUMERIC +DEFS += -DPY_NUMERIC +endif + diff --git a/externals/grill/py/build/gnumake-win-cygwin.inc b/externals/grill/py/build/gnumake-win-cygwin.inc index 70cfca17..102c2ecd 100644 --- a/externals/grill/py/build/gnumake-win-cygwin.inc +++ b/externals/grill/py/build/gnumake-win-cygwin.inc @@ -6,3 +6,10 @@ LIBS += -lpython$(PYTHONVER) -lshell32 ifdef PY_NUMARRAY DEFS += -DPY_NUMARRAY endif +ifdef PY_NUMPY +DEFS += -DPY_NUMPY +endif +ifdef PY_NUMERIC +DEFS += -DPY_NUMERIC +endif + diff --git a/externals/grill/py/build/nmake-win-msvc.inc b/externals/grill/py/build/nmake-win-msvc.inc index 0d4fa162..0820daf9 100644 --- a/externals/grill/py/build/nmake-win-msvc.inc +++ b/externals/grill/py/build/nmake-win-msvc.inc @@ -6,3 +6,11 @@ LIBS=$(LIBS) shell32.lib !ifdef PY_NUMARRAY DEFS = $(DEFS) /DPY_NUMARRAY !endif +!ifdef PY_NUMPY +INCPATH=$(INCPATH) /I$(PYTHONPATH)\Lib\site-packages\numpy\core\include +DEFS = $(DEFS) /DPY_NUMPY +!endif +!ifdef PY_NUMERIC +DEFS = $(DEFS) /DPY_NUMERIC +!endif + -- cgit v1.2.1