X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=vst%2FSConscript;h=eb4dd6683b0fa3d0dcf630be2732da47d4699ff8;hb=badc087263990ecf360792c10e4d9f2d60828d43;hp=0e3055e4ce41204db37964e2aa2cfc958a8c9086;hpb=3e6feb62ae37cbf98364ccb36e9be47a52ceb8bf;p=ardour.git

diff --git a/vst/SConscript b/vst/SConscript
index 0e3055e4ce..eb4dd6683b 100644
--- a/vst/SConscript
+++ b/vst/SConscript
@@ -35,7 +35,7 @@ ardour_vst.Merge ([
     libraries['libgnomecanvas2'],
     libraries['libgnomecanvasmm'],
     libraries['sysmidi'],
-    libraries['sndfile'],
+    libraries['sndfile-ardour'],
     libraries['flac'],
     libraries['lrdf'],
     libraries['glibmm2'],
@@ -66,12 +66,20 @@ 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)))
+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 (wine_executable, 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'], 'ardour2'), 'ardour_vst.exe.so'))
 
-Default([wine_generated_executable, wine_executable])
+env.Alias ('tarball', env.Distribute (env['DISTTREE'],
+                                      [ 'SConscript',
+                                        'winmain.c',
+                                        'ardourvst.in',
+                                        'ardevst'
+                                        ]))
 
-# 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'))