X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Faudiographer%2Fwscript;h=d3efbf59ef6ba38701aeb97654e94bd05b5acbac;hb=6f7112547658b01594d8cd81a0f52c4edc017e1d;hp=996329777f0a911b317deee12762fe9d3e384c4d;hpb=c1ef7b14a3e1200817180cfaf6425e9bdf0eb51b;p=ardour.git

diff --git a/libs/audiographer/wscript b/libs/audiographer/wscript
index 996329777f..d3efbf59ef 100644
--- a/libs/audiographer/wscript
+++ b/libs/audiographer/wscript
@@ -44,27 +44,36 @@ def configure(conf):
 def build(bld):
 
     # Headers
-    #bld.install_files('${INCLUDEDIR}/audiographer', 'audiographer/*.h')
-    #bld.install_files('${INCLUDEDIR}/audiographer/general', 'audiographer/general/*.h')
-    #bld.install_files('${INCLUDEDIR}/audiographer/sndfile', 'audiographer/sndfile/*.h')
-    #bld.install_files('${INCLUDEDIR}/audiographer/utils', 'audiographer/utils/*.h')
+    #bld.install_files('${INCLUDEDIR}/audiographer', bld.path.ant_glob('audiographer/*.h'))
+    #bld.install_files('${INCLUDEDIR}/audiographer/general', bld.path.ant_glob('audiographer/general/*.h'))
+    #bld.install_files('${INCLUDEDIR}/audiographer/sndfile', bld.path.ant_glob('audiographer/sndfile/*.h'))
+    #bld.install_files('${INCLUDEDIR}/audiographer/utils', bld.path.ant_glob('audiographer/utils/*.h'))
 
     #bld.env['BUILD_TESTS'] = True
-    bld.env['HAVE_ALL_GTHREAD'] = bld.env['HAVE_GLIB'] and bld.env['HAVE_GLIBMM'] and bld.env['HAVE_GTHREAD']
-
-    audiographer = bld(features = 'cxx cxxshlib')
-    audiographer.source = '''
-            private/gdither/gdither.cc
-            src/general/sample_format_converter.cc
-            src/routines.cc
-            src/debug_utils.cc
-            src/general/broadcast_info.cc
-    '''
-
+    bld.env['HAVE_ALL_GTHREAD'] = (bld.is_defined('HAVE_GLIB')
+                                   and bld.is_defined('HAVE_GLIBMM')
+                                   and bld.is_defined('HAVE_GTHREAD'))
+
+    audiographer_sources = [
+        'private/gdither/gdither.cc',
+        'src/general/sample_format_converter.cc',
+        'src/routines.cc',
+        'src/debug_utils.cc',
+        'src/general/broadcast_info.cc',
+        'src/general/normalizer.cc'
+        ]
     if bld.is_defined('HAVE_SAMPLERATE'):
-        audiographer.source += '''
-                src/general/sr_converter.cc
-        '''
+        audiographer_sources += [ 'src/general/sr_converter.cc' ]
+
+    if bld.is_defined ('INTERNAL_SHARED_LIBS'):
+        audiographer              = bld.shlib(features = 'c cxx cshlib cxxshlib', source=audiographer_sources)
+        # macros for this shared library
+        audiographer.defines      = [ 'LIBAUDIOGRAPHER_DLL_EXPORTS=1' ]
+    else:
+        audiographer              = bld.stlib(features = 'c cxx cstlib cxxstlib', source=audiographer_sources)
+        audiographer.cxxflags     = [ '-fPIC' ]
+        audiographer.cflags       = [ '-fPIC' ]
+        audiographer.defines      = []
 
     audiographer.name           = 'libaudiographer'
     audiographer.target         = 'audiographer'
@@ -73,7 +82,7 @@ def build(bld):
     audiographer.uselib         = 'GLIB GLIBMM GTHREAD SAMPLERATE SNDFILE'
     audiographer.use            = 'libpbd'
     audiographer.vnum           = AUDIOGRAPHER_LIB_VERSION
-    audiographer.install_path   = os.path.join(bld.env['LIBDIR'], 'ardour3')
+    audiographer.install_path   = bld.env['LIBDIR']
 
 
     if bld.env['BUILD_TESTS'] and bld.is_defined('HAVE_CPPUNIT'):
@@ -93,7 +102,7 @@ def build(bld):
                 tests/general/silence_trimmer_test.cc
         '''
 
-        if bld.env['HAVE_ALL_GTHREAD']:
+        if bld.is_defined('HAVE_ALL_GTHREAD'):
             obj.source += '''
                     tests/general/threader_test.cc
             '''