X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fpbd%2Fwscript;h=64dd2a332fc8a882aa532da116fd13c0d10c40db;hb=6d1ca9ce42de34ebe4d605fe637a68e80292fac2;hp=8e3b435d7d39999e8547441fbca974887955cd89;hpb=86474713798d6fb40c161ae4b319ffa73472d3c1;p=ardour.git

diff --git a/libs/pbd/wscript b/libs/pbd/wscript
index 8e3b435d7d..64dd2a332f 100644
--- a/libs/pbd/wscript
+++ b/libs/pbd/wscript
@@ -1,5 +1,6 @@
 #!/usr/bin/env python
 from waflib.extras import autowaf as autowaf
+from waflib import Options
 from waflib import TaskGen
 import os
 import sys
@@ -27,6 +28,57 @@ out = 'build'
 
 path_prefix = 'libs/pbd/'
 
+libpbd_sources = [
+    'basename.cc',
+    'base_ui.cc',
+    'boost_debug.cc',
+    'cartesian.cc',
+    'command.cc',
+    'convert.cc',
+    'controllable.cc',
+    'controllable_descriptor.cc',
+    'clear_dir.cc',
+    'crossthread.cc',
+    'cpus.cc',
+    'debug.cc',
+    'enumwriter.cc',
+    'event_loop.cc',
+    'enums.cc',
+    'epa.cc',
+    'error.cc',
+    'file_manager.cc',
+    'file_utils.cc',
+    'fpu.cc',
+    'id.cc',
+    'locale_guard.cc',
+    'malign.cc',
+    'mountpoint.cc',
+    'openuri.cc',
+    'pathexpand.cc',
+    'pathscanner.cc',
+    'pool.cc',
+    'property_list.cc',
+    'pthread_utils.cc',
+    'receiver.cc',
+    'search_path.cc',
+    'semutils.cc',
+    'shortpath.cc',
+    'signals.cc',
+    'sndfile_manager.cc',
+    'stacktrace.cc',
+    'stateful_diff_command.cc',
+    'stateful.cc',
+    'strreplace.cc',
+    'strsplit.cc',
+    'textreceiver.cc',
+    'transmitter.cc',
+    'undo.cc',
+    'uuid.cc',
+    'version.cc',
+    'whitespace.cc',
+    'xml++.cc',
+]
+
 def options(opt):
     autowaf.set_options(opt)
 
@@ -58,59 +110,13 @@ def build(bld):
     bld(rule = 'python ${SRC} ${TGT}', source = 'pbd/signals.py', target = 'pbd/signals_generated.h')
 
     # Library
-    obj = bld(features = 'cxx cxxshlib')
-    obj.source = '''
-            basename.cc
-            base_ui.cc
-            boost_debug.cc
-            cartesian.cc
-            command.cc
-            convert.cc
-            controllable.cc
-            controllable_descriptor.cc
-            clear_dir.cc
-            crossthread.cc
-            cpus.cc
-            debug.cc
-            enumwriter.cc
-            event_loop.cc
-            dmalloc.cc
-            enums.cc
-            epa.cc
-            error.cc
-            filesystem.cc
-            filesystem_paths.cc
-            file_manager.cc
-            file_utils.cc
-            fpu.cc
-            id.cc
-            locale_guard.cc
-            malign.cc
-            mountpoint.cc
-            openuri.cc
-            pathscanner.cc
-            pool.cc
-            property_list.cc
-            pthread_utils.cc
-            receiver.cc
-            search_path.cc
-            semutils.cc
-            shortpath.cc
-            signals.cc
-            sndfile_manager.cc
-            stacktrace.cc
-            stateful_diff_command.cc
-            stateful.cc
-            strreplace.cc
-            strsplit.cc
-            textreceiver.cc
-            transmitter.cc
-            undo.cc
-            uuid.cc
-            version.cc
-            whitespace.cc
-            xml++.cc
-    '''
+    if bld.is_defined ('INTERNAL_SHARED_LIBS'):
+        print('BUILD SHARED LIB')
+        obj              = bld.shlib(features = 'cxx cxxshlib', source=libpbd_sources)
+    else:
+        print('BUILD STATIC LIB')
+        obj              = bld.stlib(features = 'cxx cxxstlib', source=libpbd_sources)
+        obj.cxxflags     = [ '-fPIC' ]
 
     if bld.is_defined('DEBUG_RT_ALLOC'):
         obj.source += 'debug_rt_alloc.c'
@@ -122,7 +128,7 @@ def build(bld):
     obj.uselib       = 'GLIBMM SIGCPP XML UUID SNDFILE GIOMM'
     if sys.platform == 'darwin':
         TaskGen.task_gen.mappings['.mm'] = TaskGen.task_gen.mappings['.cc']
-        obj.source += 'cocoa_open_uri.mm'
+        obj.source += [ 'cocoa_open_uri.mm' ]
         obj.uselib += ' OSX'
     obj.vnum         = LIBPBD_LIB_VERSION
     obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3')
@@ -140,6 +146,7 @@ def build(bld):
                 test/scalar_properties.cc
                 test/signals_test.cc
                 test/convert_test.cc
+                test/filesystem_test.cc
         '''.split()
         testobj.target       = 'run-tests'
         testobj.includes     = obj.includes + ['test', '../pbd']