diff options
| author | Thomas Grill <xovo@users.sourceforge.net> | 2005-03-09 04:58:11 +0000 |
|---|---|---|
| committer | Thomas Grill <xovo@users.sourceforge.net> | 2005-03-09 04:58:11 +0000 |
| commit | e854889b99b9e515dc69d237b1031b5705e83b60 (patch) | |
| tree | 6b525184d850f15012e316ca51cf0a11563261ea /externals/grill/py/build | |
| parent | 9ccbbc943fa25426542b4fb6d6bc280c3281001b (diff) | |
fixes for detached operation and single-threaded version
use lock count instead of message queuing to avoid py->py messaging deadlock
support for buffer objects (preliminary)
updated build system
little restructuring
fixes for single-threaded compilation
added support for numarray
svn path=/trunk/; revision=2610
Diffstat (limited to 'externals/grill/py/build')
| -rw-r--r-- | externals/grill/py/build/config-lnx.def | 3 | ||||
| -rw-r--r-- | externals/grill/py/build/config-mac.def | 3 | ||||
| -rw-r--r-- | externals/grill/py/build/config-win.def | 3 | ||||
| -rw-r--r-- | externals/grill/py/build/gnumake-lnx-gcc.inc | 4 | ||||
| -rw-r--r-- | externals/grill/py/build/gnumake-mac-gcc.inc | 3 | ||||
| -rw-r--r-- | externals/grill/py/build/nmake-win-msvc.inc | 4 |
6 files changed, 19 insertions, 1 deletions
diff --git a/externals/grill/py/build/config-lnx.def b/externals/grill/py/build/config-lnx.def index 121d2cb5..3eba0d96 100644 --- a/externals/grill/py/build/config-lnx.def +++ b/externals/grill/py/build/config-lnx.def @@ -3,3 +3,6 @@ PYTHONPREFIX=/usr # which Python version do you want to compile against? PYTHONVERSION=2.3 + +# uncomment if numarray support should be compiled in +# PY_NUMARRAY=1 diff --git a/externals/grill/py/build/config-mac.def b/externals/grill/py/build/config-mac.def index be94b713..a966f137 100644 --- a/externals/grill/py/build/config-mac.def +++ b/externals/grill/py/build/config-mac.def @@ -1 +1,2 @@ -# nothing to adjust!
\ No newline at end of file +# uncomment if numarray support should be compiled in +# PY_NUMARRAY=1 diff --git a/externals/grill/py/build/config-win.def b/externals/grill/py/build/config-win.def index afa2f649..f587116d 100644 --- a/externals/grill/py/build/config-win.def +++ b/externals/grill/py/build/config-win.def @@ -1,2 +1,5 @@ # where is the Python installation? PYTHONPATH=c:\programme\prog\python24 + +# uncomment if numarray support should be compiled in +# PY_NUMARRAY=1 diff --git a/externals/grill/py/build/gnumake-lnx-gcc.inc b/externals/grill/py/build/gnumake-lnx-gcc.inc index bdb375f1..ff0a8bfa 100644 --- a/externals/grill/py/build/gnumake-lnx-gcc.inc +++ b/externals/grill/py/build/gnumake-lnx-gcc.inc @@ -1,3 +1,7 @@ DEFS += -DPY_EXPORTS INCPATH += -I$(PYTHONPREFIX)/include/python$(PYTHONVERSION) LIBS += -lpython$(PYTHONVERSION) + +ifdef PY_NUMARRAY +DEFS += -DPY_NUMARRAY +endif
\ No newline at end of file diff --git a/externals/grill/py/build/gnumake-mac-gcc.inc b/externals/grill/py/build/gnumake-mac-gcc.inc index 16e9df6f..c7268557 100644 --- a/externals/grill/py/build/gnumake-mac-gcc.inc +++ b/externals/grill/py/build/gnumake-mac-gcc.inc @@ -1,3 +1,6 @@ DEFS += -DPY_EXPORTS LIBS += -framework Python +ifdef PY_NUMARRAY +DEFS += -DPY_NUMARRAY +endif diff --git a/externals/grill/py/build/nmake-win-msvc.inc b/externals/grill/py/build/nmake-win-msvc.inc index 373f98a7..e9334065 100644 --- a/externals/grill/py/build/nmake-win-msvc.inc +++ b/externals/grill/py/build/nmake-win-msvc.inc @@ -1,3 +1,7 @@ DEFS = $(DEFS) /DPY_EXPORTS INCPATH=/I$(PYTHONPATH)\include LIBPATH=/LIBPATH:$(PYTHONPATH)\libs + +!ifdef PY_NUMARRAY +DEFS = $(DEFS) /DPY_NUMARRAY +!endif |