Replace explicit image-surface with cairo pattern/group

[ardour.git] / libs / fluidsynth / wscript

diff --git a/libs/fluidsynth/wscript b/libs/fluidsynth/wscript
index 6451ec829c85b55eb5174c9f803d4f186f84709e..724e3aaf6c5bc2ceadf5b1d8c28ea2f86f93c6e7 100644 (file)
--- a/libs/fluidsynth/wscript
+++ b/libs/fluidsynth/wscript
@@ -5,17 +5,11 @@ import os
 import sys
 
 # Version of this package (even if built as a child)
-MAJOR = '1'
-MINOR = '6'
-MICRO = '0'
+MAJOR = '2'
+MINOR = '0'
+MICRO = '1'
 LIBFLUIDSYNTH_VERSION = "%s.%s.%s" % (MAJOR, MINOR, MICRO)
 
-# Library version (UNIX style major, minor, micro)
-# major increment <=> incompatible changes
-# minor increment <=> compatible changes (additions)
-# micro increment <=> no interface changes
-LIBLTC_LIB_VERSION = '1.1.1'
-
 # Variables for 'waf dist'
 APPNAME = 'libltc'
 VERSION = LIBFLUIDSYNTH_VERSION
@@ -30,7 +24,7 @@ def options(opt):
 
 def configure(conf):
     if conf.is_defined('USE_EXTERNAL_LIBS'):
-        autowaf.check_pkg(conf, 'fluidsynth', uselib_store='LIBFLUIDSYNTH', atleast_version=LIBFLUIDSYNTH_LIB_VERSION, mandatory=True)
+        autowaf.check_pkg(conf, 'fluidsynth', uselib_store='LIBFLUIDSYNTH', atleast_version=LIBFLUIDSYNTH_VERSION, mandatory=True)
     else:
         conf.load('compiler_c')
         autowaf.configure(conf)
@@ -41,7 +35,7 @@ def build(bld):
     bld (export_includes = ['fluidsynth'],
          name = 'libfluidsynth_includes'
          )
-    bld.stlib (source = [
+    obj = bld.stlib (source = [
         'src/fluid_midi.c',
         'src/fluid_adsr_env.c',
         'src/fluid_chorus.c',
@@ -64,10 +58,14 @@ def build(bld):
         'src/fluid_hash.c',
         'src/fluid_list.c',
         'src/fluid_ringbuffer.c',
+        'src/fluid_samplecache.c',
         'src/fluid_settings.c',
+        'src/fluid_sffile.c',
+        'src/fluid_sfont.c',
+        'src/fluid_synth_monopoly.c',
         'src/fluid_sys.c'
         ],
-        cflags = [ '-fPIC', '-fvisibility=hidden' ],
+        cflags = [ bld.env['compiler_flags_dict']['pic'], '-fvisibility=hidden', '-std=gnu99', '-Wno-unused-function' ],
         includes = ['.', 'src/' ],
                target = 'libfluidsynth',
                use    = 'libfluidsynth_includes',
@@ -75,5 +73,13 @@ def build(bld):
                defines = [ 'HAVE_CONFIG_H', 'DEFAULT_SOUNDFONT=""' ]
                )
 
+    # wine-gcc hacks:
+    # defining __MINGW32__ for wine-gcc is a workaround for fluidsynth's include
+    # strategy (which is made for mingw or windows) without it
+    # winsock2.h will complain about undeclared "u_short"
+    # we also need to explicitly define  _WIN32
+    if bld.is_defined('WINDOWS_VST_SUPPORT') and not bld.env['build_target'] == 'mingw':
+        obj.defines += [ '_WIN32', '__MINGW32__' ]
+
 def shutdown():
     autowaf.shutdown()