Changeset 7dd8b04

Timestamp:

Jul 15, 2012, 11:16:24 PM (13 years ago)

Author:

Paul Brossier <piem@piem.org>

Branches:

feature/autosink, feature/cnn, feature/cnn_org, feature/constantq, feature/crepe, feature/crepe_org, feature/pitchshift, feature/pydocstrings, feature/timestretch, fix/ffmpeg5, master, pitchshift, sampler, timestretch, yinfft+

Children:

551c6c3

Parents:

0b5b7b2 (diff), 9ccd89f (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'develop' into io

Files:

• interfaces/python/aubiowraphell.h (modified) (2 diffs)
• interfaces/python/build_osx (modified) (1 diff)
• wscript (modified) (3 diffs)

interfaces/python/aubiowraphell.h

@@ -8 +8 @@
 } Py_## NAME;
 
-#define AUBIO_NEW(NAME) \
-static PyObject * \
-Py_ ## NAME ## _new (PyTypeObject * type, PyObject * args, PyObject * kwds) \
-{ \
-  Py_ ## NAME * self; \
-  self = (Py_ ## NAME *) type->tp_alloc (type, 0); \
-  return (PyObject *)self; \
-}
-
 #define AUBIO_INIT(NAME, PARAMS... ) \
 static int \
@@ -23 +14 @@
   self->o = new_aubio_## NAME ( PARAMS ); \
   if (self->o == NULL) { \
+    PyErr_SetString (PyExc_StandardError, "error creating object"); \
     return -1; \
   } \

interfaces/python/build_osx

@@ -1 +1 @@
 #! /bin/sh
 
-export CFLAGS=-I/Users/piem/Library/Python/2.7/site-packages/numpy-1.8.0.dev_436a28f_20120710-py2.7-macosx-10.7-x86_64.egg/numpy/core/include/
+set -e
+set -x
+
+export CFLAGS="-I/Users/piem/Library/Python/2.7/site-packages/numpy-1.8.0.dev_436a28f_20120710-py2.7-macosx-10.7-x86_64.egg/numpy/core/include/ -arch i386 -arch x86_64"
 export LDFLAGS=-L../../build/src/
 python setup.py clean build

wscript

@@ -53 +53 @@
       help='set target platform for cross-compilation', dest='target_platform')
   ctx.load('compiler_c')
-  ctx.load('compiler_cxx')
   ctx.load('gnu_dirs')
   ctx.load('waf_unit_test')
@@ -60 +59 @@
   import Options
   ctx.check_tool('compiler_c')
-  ctx.check_tool('compiler_cxx')
   ctx.check_tool('gnu_dirs') # helpful for autotools transition and .pc generation
-  #ctx.check_tool('misc') # needed for subst
   ctx.load('waf_unit_test')
   ctx.env.CFLAGS = ['-g']
@@ -71 +68 @@
   if Options.platform == 'win32':
     ctx.env['shlib_PATTERN'] = 'lib%s.dll'
+
+  if Options.platform == 'macfat':
+    ctx.env.CFLAGS += ['-arch', 'i386', '-arch', 'x86_64']
+    ctx.env.LINKFLAGS += ['-arch', 'i386', '-arch', 'x86_64']
+    ctx.env.CC = 'llvm-gcc-4.2'
+    ctx.env.LINK_CC = 'llvm-gcc-4.2'
 
   # check for required headers