diff --git a/.gitmodules b/.gitmodules index d97f8bae..cbe668dc 100644 --- a/.gitmodules +++ b/.gitmodules @@ -9,11 +9,11 @@ shallow = true [submodule "vst/external/VST_SDK/VST3_SDK/pluginterfaces"] path = vst/external/VST_SDK/VST3_SDK/pluginterfaces - url = https://github.com/sfztools/vst3_pluginterfaces.git + url = https://github.com/steinbergmedia/vst3_pluginterfaces.git shallow = true [submodule "vst/external/VST_SDK/VST3_SDK/public.sdk"] path = vst/external/VST_SDK/VST3_SDK/public.sdk - url = https://github.com/sfztools/vst3_public_sdk.git + url = https://github.com/steinbergmedia/vst3_public_sdk.git shallow = true [submodule "vst/external/VST_SDK/VST3_SDK/vstgui4"] path = editor/external/vstgui4 diff --git a/.travis/script_mingw.sh b/.travis/script_mingw.sh index 85aac04e..cdd4b941 100755 --- a/.travis/script_mingw.sh +++ b/.travis/script_mingw.sh @@ -3,6 +3,11 @@ set -ex . .travis/docker_container.sh +# need to convert some includes to lower case (as of VST 3.7.1) +find vst/external/VST_SDK -type d -name source -exec \ + find {} -type f -name '*.[hc]' -o -name '*.[hc]pp' -print0 \; | \ + xargs -0 sed -i 's///' + mkdir -p build/${INSTALL_DIR} && cd build if [[ ${CROSS_COMPILE} == "mingw32" ]]; then buildenv i686-w64-mingw32-cmake -DCMAKE_BUILD_TYPE=Release \ diff --git a/vst/CMakeLists.txt b/vst/CMakeLists.txt index ccb73714..8f993b8c 100644 --- a/vst/CMakeLists.txt +++ b/vst/CMakeLists.txt @@ -242,6 +242,7 @@ elseif(SFIZZ_AU) "${VST3SDK_BASEDIR}/pluginterfaces/base/coreiids.cpp" "${VST3SDK_BASEDIR}/pluginterfaces/base/funknown.cpp" "${VST3SDK_BASEDIR}/pluginterfaces/base/ustring.cpp" + "${VST3SDK_BASEDIR}/public.sdk/source/common/commoniids.cpp" "${VST3SDK_BASEDIR}/public.sdk/source/vst/vstinitiids.cpp") # Add VST hosting classes diff --git a/vst/external/VST_SDK/VST3_SDK/base b/vst/external/VST_SDK/VST3_SDK/base index 4f6a7184..7b977c03 160000 --- a/vst/external/VST_SDK/VST3_SDK/base +++ b/vst/external/VST_SDK/VST3_SDK/base @@ -1 +1 @@ -Subproject commit 4f6a7184f20f40a7c940a6717e6e0d8b35eeea63 +Subproject commit 7b977c031f42a6bab08e8b10f4f8df0a1f516c38 diff --git a/vst/external/VST_SDK/VST3_SDK/pluginterfaces b/vst/external/VST_SDK/VST3_SDK/pluginterfaces index 8c07a58d..fe202edc 160000 --- a/vst/external/VST_SDK/VST3_SDK/pluginterfaces +++ b/vst/external/VST_SDK/VST3_SDK/pluginterfaces @@ -1 +1 @@ -Subproject commit 8c07a58d84c544a73e1ccad2efae200505796773 +Subproject commit fe202edc93e9a01a1f79a614cc9a292dc9bf3e6e diff --git a/vst/external/VST_SDK/VST3_SDK/public.sdk b/vst/external/VST_SDK/VST3_SDK/public.sdk index b63097eb..a3a3ed1b 160000 --- a/vst/external/VST_SDK/VST3_SDK/public.sdk +++ b/vst/external/VST_SDK/VST3_SDK/public.sdk @@ -1 +1 @@ -Subproject commit b63097ebce2105845aa97d04808fca4dfd51307c +Subproject commit a3a3ed1b1620df0b064564f1fd5423ae110234a0