X-Git-Url: https://git.aubio.org/?p=pd-aubio.git;a=blobdiff_plain;f=wscript;h=e1afe5f99a8966c6442b3d27f96b3a0540f782d7;hp=8e74590e74a3c1da536fd1c890e1d7fd6be47a8a;hb=591c04c8c238a386c8147a9133c28d4ba2f50fdc;hpb=242992448f4febdab2d21ca6bb20eb888442061e

diff --git a/wscript b/wscript
index 8e74590..e1afe5f 100644
--- a/wscript
+++ b/wscript
@@ -18,41 +18,48 @@ def options(ctx):
 
 def configure(ctx):
     ctx.load('compiler_c')
+
+    if ctx.env['DEST_OS'] == 'linux':
+        ctx.env.cshlib_PATTERN = '%s.pd_linux'
+    elif ctx.env['DEST_OS'] == 'darwin':
+        ctx.env.cshlib_PATTERN = '%s.pd_darwin'
+        # add default include path for both pd and pd-extended
+        # set CFLAGS for custom location
+        ctx.env.CFLAGS += ['-I/Applications/Pd-0.47-1.app/Contents/Resources/src']
+        ctx.env.CFLAGS += ['-I/Applications/Pd-extended.app/Contents/Resources/include']
+        ctx.env.CFLAGS += ['-arch', 'i386', '-arch', 'x86_64']
+        ctx.env.LINKFLAGS += ['-arch', 'i386', '-arch', 'x86_64']
+        ctx.env.LINKFLAGS_cshlib = ['-bundle', '-undefined', 'suppress', '-flat_namespace']
+    elif ctx.env['DEST_OS'] in ['win32', 'win64']:
+        ctx.env.cshlib_PATTERN = '%s.dll'
+        # do not use -fPIC -DPIC on windows
+        ctx.env.CFLAGS_cshlib = []
+        ctx.env.LINKFLAGS_cshlib +=  ['-export_dynamic', '-lpd']
+    else:
+        ctx.start_msg("Checking for platform")
+        ctx.end_msg("no idea how to build for %s yet, assuming linux"
+                % ctx.env['DEST_OS'], 'YELLOW')
+        ctx.env.cshlib_PATTERN = '%s.pd_linux'
+        ctx.env.LINKFLAGS_cshlib += ['--export_dynamic']
+
     # check for puredata header
     ctx.check(header_name='m_pd.h')
-    # required dependancies
+
+    # required dependencies
     ctx.check_cfg(package = 'aubio', atleast_version = '0.4.0',
             args = '--cflags --libs')
 
 def build(bld):
 
-    uselib = ['AUBIO']
     bld(features = 'c cshlib',
-        source = bld.path.ant_glob('*.c'),
+        source = bld.path.ant_glob('src/*.c'),
         uselib = ['AUBIO'],
         target = 'aubio',
         defines = ['PD', 'PACKAGE_VERSION=\"'+repr(VERSION)+"\""],
-        install_path = '${PREFIX}/lib/pd/extra')
+        install_path = '${PREFIX}/lib/pd/extra/aubio')
 
-    if bld.env['DEST_OS'] == 'win32':
-        bld.env.cshlib_PATTERN = '%s.dll'
-        # do not use -fPIC -DPIC on windows
-        bld.env.cshlib_CCFLAGS.remove('-fPIC')
-        bld.env.cshlib_CCFLAGS.remove('-DPIC')
-        bld.env.append_unique('shlib_LINKFLAGS', ['-export_dynamic', '-lpd'])
-    elif bld.env['DEST_OS'] == 'darwin':
-        bld.env.cshlib_PATTERN = '%s.pd_darwin'
-        bld.env.append_unique('shlib_LINKFLAGS',
-            ['-bundle', '-undefined suppres', '-flat_namespace'])
-    else: #if bld.env['DEST_OS'] == 'linux':
-        bld.env.cshlib_PATTERN = '%s.pd_linux'
-        bld.env.append_unique('shlib_LINKFLAGS', ['--export_dynamic'])
-
-    # do not rename the shlib at all
-    bld.env.shlib_PATTERN = '%s'
-
-    bld.install_files('${PREFIX}/lib/pd/doc/5.reference',
+    bld.install_files('${PREFIX}/lib/pd/extra/aubio',
             bld.path.ant_glob('help/**.pd'))
 
-    bld.install_files('${PREFIX}/lib/pd/doc/aubio',
+    bld.install_files('${PREFIX}/lib/pd/extra/aubio/examples',
             bld.path.ant_glob('examples/**.pd'))