Revision: 557
http://rpy.svn.sourceforge.net/rpy/?rev=557&view=rev
Author: lgautier
Date: 2008-06-08 11:12:15 -0700 (Sun, 08 Jun 2008)
Log Message:
-----------
- callback for writeconsole switched off on win32
- figured out that Rinterface.h in missing from R's distribution on win32
Modified Paths:
--------------
branches/rpy_nextgen/rpy/rinterface/rinterface.c
branches/rpy_nextgen/setup.py
Removed Paths:
-------------
branches/rpy_nextgen/rpy/rinterface/include/
Modified: branches/rpy_nextgen/rpy/rinterface/rinterface.c
===================================================================
--- branches/rpy_nextgen/rpy/rinterface/rinterface.c 2008-06-08 17:51:09 UTC
(rev 556)
+++ branches/rpy_nextgen/rpy/rinterface/rinterface.c 2008-06-08 18:12:15 UTC
(rev 557)
@@ -59,7 +59,6 @@
#include <Rinternals.h>
#include <Rdefines.h>
-#define R_INTERFACE_PTRS
#include <Rinterface.h>
#include <R_ext/Complex.h>
#include <Rembedded.h>
Modified: branches/rpy_nextgen/setup.py
===================================================================
--- branches/rpy_nextgen/setup.py 2008-06-08 17:51:09 UTC (rev 556)
+++ branches/rpy_nextgen/setup.py 2008-06-08 18:12:15 UTC (rev 557)
@@ -96,6 +96,10 @@
#f_in.close()
#f_out.close()
+ define_macros = []
+ if sys.platform != 'win32':
+ define_macros.append(('R_INTERFACE_PTRS', 1))
+
rinterface_ext = Extension(
pack_name + '.rinterface.rinterface',
[os.path.join('rpy', 'rinterface', 'array.c'),
@@ -105,7 +109,7 @@
os.path.join('rpy', 'rinterface')],
libraries = ['R', 'Rlapack', 'Rblas'],
library_dirs = r_libs,
- #define_macros = [('RPY_RINTERFACE_INIT', 'initrinterface_' +
r_packversion), ],
+ define_macros = define_macros,
runtime_library_dirs = r_libs,
extra_link_args = get_rconfig(RHOME, '--ldflags') +\
get_rconfig(RHOME, 'LAPACK_LIBS') +\
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-------------------------------------------------------------------------
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://sourceforge.net/services/buy/index.php
_______________________________________________
rpy-list mailing list
rpy-list@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/rpy-list
