# HG changeset patch # User Chris Cannam # Date 1576687880 0 # Node ID a38d318c85a9ae247442b7b7a3d9f20d1d14c073 # Parent e1d65734d95310d4126f937ec66852d9ca7d56e3 MSVC fixes diff -r e1d65734d953 -r a38d318c85a9 PyPlugScanner.cpp --- a/PyPlugScanner.cpp Wed Aug 14 14:59:19 2019 +0100 +++ b/PyPlugScanner.cpp Wed Dec 18 16:51:20 2019 +0000 @@ -19,6 +19,10 @@ //#include "vamp-hostsdk/PluginHostAdapter.h" #ifdef _WIN32 +// We should be using the unicode apis, but we're not (yet) +#undef UNICODE +#undef _UNICODE +#define _MBCS 1 #include #include #define pathsep ("\\") @@ -385,7 +389,7 @@ } } #ifdef _WIN32 - char *cpfiles = getenv("ProgramFiles"); + const char *cpfiles = getenv("ProgramFiles"); if (!cpfiles) cpfiles = "C:\\Program Files"; std::string pfiles(cpfiles); std::string::size_type f; diff -r e1d65734d953 -r a38d318c85a9 vampy-main.cpp --- a/vampy-main.cpp Wed Aug 14 14:59:19 2019 +0100 +++ b/vampy-main.cpp Wed Dec 18 16:51:20 2019 +0000 @@ -39,6 +39,13 @@ #endif +#ifdef _WIN32 +// We should be using the unicode apis, but we're not (yet) +#undef UNICODE +#undef _UNICODE +#define _MBCS 1 +#endif + #include "vamp/vamp.h" #include "vamp-sdk/PluginAdapter.h" #include "PyPlugScanner.h"