diff --git a/MSVCvst_scan/MSVCvst3_scan.vcproj b/MSVCvst_scan/MSVCvst3_scan.vcproj new file mode 100644 index 0000000000..57d5c854e8 --- /dev/null +++ b/MSVCvst_scan/MSVCvst3_scan.vcproj @@ -0,0 +1,311 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/MSVCvst_scan/resource b/MSVCvst_scan/resource index a6e974079a..e9a99f6f4b 100644 --- a/MSVCvst_scan/resource +++ b/MSVCvst_scan/resource @@ -1,6 +1,6 @@ //{{NO_DEPENDENCIES}} // Microsoft Visual C++ generated include file. -// Used by vst_scan.rc +// Used by vst_scan.rc and vst3_scan.rc // #define IDM_ABOUTBOX 0x0010 #define IDD_ABOUTBOX 100 diff --git a/MSVCvst_scan/vst3_scan.rc.in b/MSVCvst_scan/vst3_scan.rc.in new file mode 100644 index 0000000000..e110a6459d --- /dev/null +++ b/MSVCvst_scan/vst3_scan.rc.in @@ -0,0 +1,101 @@ +// Microsoft Visual C++ generated resource script. +// +#include "resource." + +#define APSTUDIO_READONLY_SYMBOLS +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 2 resource. +// +#include "afxres.h" + +///////////////////////////////////////////////////////////////////////////// +#undef APSTUDIO_READONLY_SYMBOLS + +///////////////////////////////////////////////////////////////////////////// +// English (U.K.) resources + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENG) +#ifdef _WIN32 +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_UK +#pragma code_page(1252) +#endif //_WIN32 + +///////////////////////////////////////////////////////////////////////////// +// +// Version +// + +1 VERSIONINFO + FILEVERSION @MSVC_SCANNER_APP_MAJOR@,@MSVC_SCANNER_APP_MINOR@,@MSVC_SCANNER_APP_MICRO@,@MSVC_SCANNER_APP_INTERFACE_AGE@ + PRODUCTVERSION @MSVC_SCANNER_APP_MAJOR@,@MSVC_SCANNER_APP_MINOR@,@MSVC_SCANNER_APP_MICRO@,@MSVC_SCANNER_APP_INTERFACE_AGE@ + FILEFLAGSMASK 0x3fL +#ifdef _DEBUG + FILEFLAGS 0x29L +#else + FILEFLAGS 0x28L +#endif + FILEOS 0x4L + FILETYPE 0x1L + FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "080904b0" + BEGIN + VALUE "CompanyName", "Harrison Audio LLC" + VALUE "FileDescription", "VST3 Plugin Scanning Application" + VALUE "FileVersion", "@MSVC_SCANNER_APP_VERSION@.@MSVC_SCANNER_APP_INTERFACE_AGE@" + VALUE "InternalName", "vst3_scan@DLL_SUFFIX@" + VALUE "LegalCopyright", "Copyright Paul Davis and others © 1999-2014" + VALUE "LegalTrademarks", "Harrison and Mixbus are trademarks of Harrison Audio LLC" + VALUE "OriginalFilename", "ardour-vst3-scanner.exe" + VALUE "ProductName", "MSVCvst3_scan" + VALUE "ProductVersion", "@MSVC_SCANNER_APP_MAJOR@, @MSVC_SCANNER_APP_MINOR@, @MSVC_SCANNER_APP_MICRO@, @MSVC_SCANNER_APP_INTERFACE_AGE@" + VALUE "SpecialBuild", "Built for Microsoft Windows by John Emmas - (© 2014)" + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x809, 1200 + END +END + + +#ifdef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// TEXTINCLUDE +// + +1 TEXTINCLUDE +BEGIN + "resource.\0" +END + +3 TEXTINCLUDE +BEGIN + "\r\0" +END + +2 TEXTINCLUDE +BEGIN + "#include ""afxres.h""\r\0" +END + +#endif // APSTUDIO_INVOKED + +#endif // English (U.K.) resources +///////////////////////////////////////////////////////////////////////////// + + + +#ifndef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 3 resource. +// + +///////////////////////////////////////////////////////////////////////////// +#endif // not APSTUDIO_INVOKED + diff --git a/libs/ardour/plugin_manager.cc b/libs/ardour/plugin_manager.cc index e1312db23b..0218c3dde6 100644 --- a/libs/ardour/plugin_manager.cc +++ b/libs/ardour/plugin_manager.cc @@ -194,7 +194,15 @@ PluginManager::PluginManager () #ifdef VST3_SUPPORT if (!PBD::find_file (vstsp, #ifdef PLATFORM_WINDOWS + #ifdef DEBUGGABLE_SCANNER_APP + #if defined(DEBUG) || defined(_DEBUG) + "ardour-vst3-scannerD.exe" + #else + "ardour-vst3-scannerRDC.exe" + #endif + #else "ardour-vst3-scanner.exe" + #endif #else "ardour-vst3-scanner" #endif diff --git a/msvc32-fixup.pl b/msvc32-fixup.pl index e85ab18be2..d9328b2003 100644 --- a/msvc32-fixup.pl +++ b/msvc32-fixup.pl @@ -99,5 +99,6 @@ if ($command eq -buildall) { process_file ("MSVCardour3/MSVCArdour5.vsprops"); process_file ("MSVCMixbus3/MSVCMixbus5.vsprops"); process_file ("MSVCvst_scan/vst_scan.rc"); + process_file ("MSVCvst_scan/vst3_scan.rc"); process_file ("gtk2_ardour/win32/msvc_resources.rc"); }