X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=vst%2FSConscript;h=d0f1ff7487d657171142a6a21745b23801d84d4d;hb=ff26317d4f7904c071d7ecfb96fd84e71728f6d0;hp=a1f2bbb616fdfba4e39f7abc5f02a240da6f4473;hpb=93c7aeba048f19df5abee5e4325ef8b0ef62c279;p=ardour.git

diff --git a/vst/SConscript b/vst/SConscript
index a1f2bbb616..d0f1ff7487 100644
--- a/vst/SConscript
+++ b/vst/SConscript
@@ -8,7 +8,7 @@ from stat import *
 
 Import('env install_prefix final_prefix config_prefix subst_dict libraries')
 
-ardour_vst = env.Copy()
+ardour_vst = env.Clone()
 
 sources = Split ("""
 winmain.c
@@ -36,7 +36,6 @@ ardour_vst.Merge ([
     libraries['libgnomecanvasmm'],
     libraries['sysmidi'],
     libraries['sndfile'],
-    libraries['flac'],
     libraries['lrdf'],
     libraries['glibmm2'],
     libraries['pangomm'],
@@ -66,15 +65,15 @@ wine_executable = ardour_vst.SubstInFile ('ardourvst', 'ardourvst.in', SUBST_DIC
 
 # make sure the scripts are executable
 
-ardour_vst.AddPostAction (wine_executable, ardour_vst.Action (os.chmod ('ardevst', S_IRUSR|S_IROTH|S_IRGRP|S_IWUSR|S_IXUSR|S_IXOTH|S_IXGRP)))
-ardour_vst.AddPostAction (wine_executable, ardour_vst.Action (os.chmod ('ardourvst', S_IRUSR|S_IROTH|S_IRGRP|S_IWUSR|S_IXUSR|S_IXOTH|S_IXGRP)))
-
-Default([wine_generated_executable, wine_executable])
-
-# the wine script - into the bin dir
-env.Alias('install', env.Install(os.path.join(install_prefix, 'bin'), wine_executable))
-# the win32 executable - into the lib dir since the wine script will look for it there
-env.Alias('install', env.Install(os.path.join(install_prefix, 'lib/ardour2'), 'ardour_vst.exe.so'))
+if ardour_vst['VST']:
+    ardour_vst.AddPostAction (wine_executable, ardour_vst.Action (Chmod ('vst/ardevst', 0755)))
+    ardour_vst.AddPostAction (wine_executable, ardour_vst.Action (Chmod ("vst/" + str(wine_executable[0]), 0755)))
+    Default([wine_generated_executable, wine_executable])
+    
+    # the wine script - into the bin dir
+    env.Alias('install', env.Install(os.path.join(install_prefix, 'bin'), wine_executable))
+    # the win32 executable - into the lib dir since the wine script will look for it there
+    env.Alias('install', env.Install(os.path.join(install_prefix, env['LIBDIR'], 'ardour3'), 'ardour_vst.exe.so'))
 
 env.Alias ('tarball', env.Distribute (env['DISTTREE'],
                                       [ 'SConscript',