Changeset 7dd8b04


Ignore:
Timestamp:
Jul 15, 2012, 11:16:24 PM (8 years ago)
Author:
Paul Brossier <piem@piem.org>
Branches:
feature/autosink, feature/constantq, feature/pitchshift, feature/pydocstrings, feature/timestretch, 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:
3 edited

Legend:

Unmodified
Added
Removed
  • interfaces/python/aubiowraphell.h

    r0b5b7b2 r7dd8b04  
    88} Py_## NAME;
    99
    10 #define AUBIO_NEW(NAME) \
    11 static PyObject * \
    12 Py_ ## NAME ## _new (PyTypeObject * type, PyObject * args, PyObject * kwds) \
    13 { \
    14   Py_ ## NAME * self; \
    15   self = (Py_ ## NAME *) type->tp_alloc (type, 0); \
    16   return (PyObject *)self; \
    17 }
    18 
    1910#define AUBIO_INIT(NAME, PARAMS... ) \
    2011static int \
     
    2314  self->o = new_aubio_## NAME ( PARAMS ); \
    2415  if (self->o == NULL) { \
     16    PyErr_SetString (PyExc_StandardError, "error creating object"); \
    2517    return -1; \
    2618  } \
  • interfaces/python/build_osx

    r0b5b7b2 r7dd8b04  
    11#! /bin/sh
    22
    3 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/
     3set -e
     4set -x
     5
     6export 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"
    47export LDFLAGS=-L../../build/src/
    58python setup.py clean build
  • wscript

    r0b5b7b2 r7dd8b04  
    5353      help='set target platform for cross-compilation', dest='target_platform')
    5454  ctx.load('compiler_c')
    55   ctx.load('compiler_cxx')
    5655  ctx.load('gnu_dirs')
    5756  ctx.load('waf_unit_test')
     
    6059  import Options
    6160  ctx.check_tool('compiler_c')
    62   ctx.check_tool('compiler_cxx')
    6361  ctx.check_tool('gnu_dirs') # helpful for autotools transition and .pc generation
    64   #ctx.check_tool('misc') # needed for subst
    6562  ctx.load('waf_unit_test')
    6663  ctx.env.CFLAGS = ['-g']
     
    7168  if Options.platform == 'win32':
    7269    ctx.env['shlib_PATTERN'] = 'lib%s.dll'
     70
     71  if Options.platform == 'macfat':
     72    ctx.env.CFLAGS += ['-arch', 'i386', '-arch', 'x86_64']
     73    ctx.env.LINKFLAGS += ['-arch', 'i386', '-arch', 'x86_64']
     74    ctx.env.CC = 'llvm-gcc-4.2'
     75    ctx.env.LINK_CC = 'llvm-gcc-4.2'
    7376
    7477  # check for required headers
Note: See TracChangeset for help on using the changeset viewer.