tweak cases where pin-mapping is reset & always sanitize map

[ardour.git] / libs / clearlooks-newer / wscript

diff --git a/libs/clearlooks-newer/wscript b/libs/clearlooks-newer/wscript
index d446275d492b678398396e06fb81c4b01f123d8c..36637971b1d03c384454c2c7944b736b3d6bf9c7 100644 (file)
--- a/libs/clearlooks-newer/wscript
+++ b/libs/clearlooks-newer/wscript
@@ -12,8 +12,8 @@ def options(opt):
     autowaf.set_options(opt)
 
 def configure(conf):
+    conf.load('compiler_c')
     autowaf.configure(conf)
-    conf.check_tool('compiler_cc')
 
 def build(bld):
     obj = bld(features = 'c cshlib')
@@ -35,13 +35,16 @@ def build(bld):
     obj.target = 'clearlooks'
     obj.uselib = 'GTK'
     obj.includes = '.'
-    obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3')
+    obj.install_path = os.path.join(bld.env['LIBDIR'], 'engines')
+    autowaf.ensure_visible_symbols (obj, True)
 
     if sys.platform == 'darwin':
         # Bit of a hack: make a symlink to the .dylib that meets GTK's criteria for finding it (namely that the library must be a *.so
         # and that it must reside in a directory called `engines')
         obj = bld(target = 'engines', rule = 'mkdir -p ${TGT} && rm -f ${TGT}/libclearlooks.so && ln -s ../libclearlooks.dylib ${TGT}/libclearlooks.so')
-
+    elif bld.env['build_target'] != 'mingw':
+        # this is a hack so that running ./ardev will work, since it sets GTK_PATH to include this dir and GTK will search {thisdir}/engines
+        obj = bld(target = 'engines', rule = 'mkdir -p ${TGT} && rm -f ${TGT}/libclearlooks.so && ln -s ../libclearlooks.so ${TGT}/libclearlooks.so')
 
 def shutdown():
     autowaf.shutdown()