diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2008-11-26 08:36:28 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2008-11-26 08:36:28 +0000 |
| commit | 3667619390a0769d994496c9a1230dff9ca6dae3 (patch) | |
| tree | c6ae74066376e5dbdfada33c1be28a680c7e10a0 | |
| parent | 5dd0f6d7f4401f2ba744661b4c0d0b1028e295b3 (diff) | |
more little build fixes for OS X
git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@4261 d708f5d6-7413-0410-9779-e7cbd77b26cf
| -rw-r--r-- | gtk2_ardour/ardev_common.sh.in | 2 | ||||
| -rw-r--r-- | libs/clearlooks-newer/SConscript | 9 |
2 files changed, 9 insertions, 2 deletions
diff --git a/gtk2_ardour/ardev_common.sh.in b/gtk2_ardour/ardev_common.sh.in index 49430e43a7..f27da66508 100644 --- a/gtk2_ardour/ardev_common.sh.in +++ b/gtk2_ardour/ardev_common.sh.in @@ -9,7 +9,7 @@ if test -d $HOME/gtk/inst ; then export GTK_PATH=~/.ardour2:libs/clearlooks-newer else echo USING OLD CLEARLOOKS - export GTK_PATH=~/.ardour2:libs/clearlooks-older: + export GTK_PATH=~/.ardour2:libs/clearlooks-older fi export VAMP_PATH=libs/vamp-plugins:$VAMP_PATH diff --git a/libs/clearlooks-newer/SConscript b/libs/clearlooks-newer/SConscript index 9b58562178..4d4c711d44 100644 --- a/libs/clearlooks-newer/SConscript +++ b/libs/clearlooks-newer/SConscript @@ -30,7 +30,14 @@ if env['GTKOSX']: libclearlooks = clearlooks.SharedLibrary('clearlooks', libclearlooks_files) usable_libclearlooks = clearlooks.Install ('engines', libclearlooks) -Default (usable_libclearlooks) +if env['GTKOSX']: + # GTK looks only for foo.so, not foo.dylib + print ("GTKOSX part"); + really_usable_module = clearlooks.Command ('engines/libclearlooks.so', usable_libclearlooks, "cd libs/clearlooks-newer/engines && ln -s libclearlooks.dylib libclearlooks.so", chdir=1) + Default (really_usable_module) +else: + print ("non-GTKOSX part"); + Default (usable_libclearlooks) env.Alias('install', env.Install ( os.path.join(install_prefix,env['LIBDIR'], 'ardour2', 'engines'), |