A bit better integration of vst sdk files

git-svn-id: svn://localhost/ardour2/trunk@1165 d708f5d6-7413-0410-9779-e7cbd77b26cf

1 files changed, 7 insertions, 9 deletions

diff --git a/libs/fst/SConscript b/libs/fst/SConscript
index 771de86dc8..5ee2fc8a16 100644
--- a/libs/fst/SConscript
+++ b/libs/fst/SConscript
@@ -11,22 +11,20 @@ Import('env install_prefix')
 fst = env.Copy(CC="winegcc")
 fst.Append (CPPPATH=".")
 
-hackSDK = fst.Command('vst/aeffectx.h', 'vstsdk2.3/source/common/aeffectx.h', [
-    Delete ('${TARGET.dir}'),
-    Copy ('${TARGET.dir}', '${SOURCE.dir}'),
-    "sed -i '/struct VstFileType\|struct VstFileSelect/,/};/d' $TARGET"
-])
-
 a = fst.Object ('fst', 'fst.c')
 b = fst.Object ('fstinfofile', 'fstinfofile.c')
 c = fst.Object ('vstwin', 'vstwin.c')
 d = fst.Object ('vsti', 'vsti.c')
 
 if fst['VST']:
-    if os.access ('vst/aeffectx.h', os.F_OK):
-        Default([hackSDK,a,b,c,d])
+    if os.access ('vstsdk2.3.zip', os.F_OK):
+        fst.Execute ("unzip -o vstsdk2.3.zip")
+        fst.Execute (Delete ("vst"))
+        fst.Execute (Copy ("vst", "vstsdk2.3/source/common"))
+        fst.Execute ("sed -i '/struct VstFileType\|struct VstFileSelect/,/};/d' vst/aeffectx.h")
+        Default([a,b,c,d])
     else:
-        print 'You have not installed the VST SDK in the correct location.'
+        print 'Did not find libs/fst/vstsdk2.3.zip.  Make sure the file is in the correct location and correctly named'
         print 'Please see http://ardour.org/building_vst_support for more information'
         sys.exit (1)