From fb9508153785ee3ad23360b3a03c92cdeb0756f5 Mon Sep 17 00:00:00 2001 From: Doug McLain Date: Wed, 29 Nov 2006 03:35:55 +0000 Subject: [PATCH] Handle both possible zip files that may be provided for the vst sdk source git-svn-id: svn://localhost/ardour2/trunk@1169 d708f5d6-7413-0410-9779-e7cbd77b26cf --- libs/fst/SConscript | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/libs/fst/SConscript b/libs/fst/SConscript index 5ee2fc8a16..f997948aff 100644 --- a/libs/fst/SConscript +++ b/libs/fst/SConscript @@ -17,16 +17,19 @@ c = fst.Object ('vstwin', 'vstwin.c') d = fst.Object ('vsti', 'vsti.c') if fst['VST']: + if os.access ('vst_sdk2_3.zip', os.F_OK): + fst.Execute ("unzip -o vst_sdk2_3.zip vstsdk2.3.zip") 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 'Did not find libs/fst/vstsdk2.3.zip. Make sure the file is in the correct location and correctly named' + print 'Did not find libs/fst/vst_sdk2_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) + sys.exit (1) + 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]) + env.Alias('tarball', env.Distribute (env['DISTTREE'], fst_src + ['SConscript',