wscript: check for 64bit using sys.maxsize (closes #3)

[vamp-aubio-plugins.git] / wscript

diff --git a/wscript b/wscript
index 64d7c7f..3ce0a7c 100644 (file)
--- a/wscript
+++ b/wscript
@@ -4,8 +4,18 @@
 
 import sys, os, platform
 
+APPNAME = 'vamp-aubio-plugins'
+
+for l in open('VERSION').readlines(): exec (l.strip())
+
+VERSION = '.'.join ([str(x) for x in [
+    VAMP_AUBIO_MAJOR_VERSION,
+    VAMP_AUBIO_MINOR_VERSION,
+    VAMP_AUBIO_PATCH_VERSION
+    ]]) + VAMP_AUBIO_VERSION_STATUS
+
 local_aubio_include  = 'contrib/aubio-dist/include'
-local_aubio_lib      = 'contrib/aubio/build/src'
+local_aubio_lib      = 'contrib/aubio-dist/lib'
 local_vamp_include   = 'contrib/vamp-plugin-sdk-2.6'
 local_vamp_lib_i686  = 'contrib/vamp-plugin-sdk-2.6-binaries-i686-linux'
 local_vamp_lib_amd64 = 'contrib/vamp-plugin-sdk-2.6-binaries-amd64-linux'
@@ -33,11 +43,10 @@ def configure(conf):
     if sys.platform.startswith('linux'):
         if 'mingw' in conf.env.CXX[0]:
             local_vamp_lib = local_vamp_lib_mingw
-        elif platform.machine() == 'x86_64':
+        elif sys.maxsize > 2**32:
             local_vamp_lib = local_vamp_lib_amd64
-        elif platform.machine() == 'x86_64':
+        else:
             local_vamp_lib = local_vamp_lib_i686
-        conf.check(lib='cblas', uselib_store='CBLAS', mandatory=False)
     elif sys.platform == 'darwin':
         local_vamp_lib = local_vamp_lib_osx
     elif sys.platform == 'win32':
@@ -65,7 +74,7 @@ def configure(conf):
         conf.check_cfg (package='vamp-sdk', uselib_store = 'VAMP',
                 args=['--cflags','--libs'], mandatory=True)
 
-    if conf.env.CC_NAME != 'msvc':
+    if conf.env.CXX_NAME != 'msvc':
         conf.env.CXXFLAGS += ['-g', '-Wall', '-Wextra']
 
     if sys.platform.startswith('linux'):
@@ -79,12 +88,14 @@ def configure(conf):
             # add plugin.map
             conf.env.append_value('LINKFLAGS', '-Wl,--version-script=../vamp-plugin.map')
     elif sys.platform == 'win32':
+        #conf.env.append_value('CXXFLAGS', '/MD')
         conf.env.append_value('CXXFLAGS', '/W4')
         conf.env.append_value('CXXFLAGS', '/EHsc')
         #conf.env.append_value('CXXFLAGS', '/D_CRT_SECURE_NO_WARNINGS')
         #, '/DWIN32', '/D_WINDOWS', '/D_USRDLL', '/D_WINDLL'
         conf.env.append_value('LINKFLAGS', '/EXPORT:vampGetPluginDescriptor')
         conf.env.append_value('LINKFLAGS', '/NODEFAULTLIB:LIBCMT')
+        conf.env.append_value('LINKFLAGS', '/NODEFAULTLIB:LIBPCMT')
     elif sys.platform == 'darwin':
         conf.env.FRAMEWORK += ['Accelerate']
 
@@ -123,3 +134,14 @@ def build(bld):
 
     #for k in bld.env.keys():
     #    print ("%s : %s", k, bld.env[k] )
+
+def dist(ctx):
+    ctx.excl  =  '**/.waf-1* **/*~ **/*.pyc **/*.swp **/.lock-w* **/.git*'
+    ctx.excl += ' **/**.tar.bz2'
+    ctx.excl += ' **/**.zip'
+    ctx.excl += ' **/**.o **/**.so'
+    ctx.excl += ' contrib/**'
+    ctx.excl += ' build/**'
+    ctx.excl += ' dist/**'
+    ctx.excl += ' **/.travis.yml'
+    ctx.excl += ' **/.appveyor.yml'