sam/sfizz
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix VST problems in our forked submodules, branch sfizz

Browse source
This commit is contained in:
Jean Pierre Cimalando 2020-05-19 21:12:48 +02:00
parent 0f702ba2c3
commit 31b5aa6de9
5 changed files with 4 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.gitmodules vendored
View file

@ -9,11 +9,11 @@
shallow = true shallow = true
[submodule "vst/external/VST_SDK/VST3_SDK/pluginterfaces"] [submodule "vst/external/VST_SDK/VST3_SDK/pluginterfaces"]
path = vst/external/VST_SDK/VST3_SDK/pluginterfaces path = vst/external/VST_SDK/VST3_SDK/pluginterfaces
url = https://github.com/steinbergmedia/vst3_pluginterfaces.git url = https://github.com/sfztools/vst3_pluginterfaces.git
shallow = true shallow = true
[submodule "vst/external/VST_SDK/VST3_SDK/public.sdk"] [submodule "vst/external/VST_SDK/VST3_SDK/public.sdk"]
path = vst/external/VST_SDK/VST3_SDK/public.sdk path = vst/external/VST_SDK/VST3_SDK/public.sdk
url = https://github.com/steinbergmedia/vst3_public_sdk.git url = https://github.com/sfztools/vst3_public_sdk.git
shallow = true shallow = true
[submodule "vst/external/VST_SDK/VST3_SDK/vstgui4"] [submodule "vst/external/VST_SDK/VST3_SDK/vstgui4"]
path = vst/external/VST_SDK/VST3_SDK/vstgui4 path = vst/external/VST_SDK/VST3_SDK/vstgui4

12
.travis/patches/vstsdk-3.6.14-mingw-atomic-add.diff
View file

@ -1,12 +0,0 @@
diff -Nru VST_SDK.orig/VST3_SDK/pluginterfaces/base/funknown.cpp VST_SDK/VST3_SDK/pluginterfaces/base/funknown.cpp
--- VST_SDK.orig/VST3_SDK/pluginterfaces/base/funknown.cpp 2019-12-02 13:58:41.000000000 +0100
+++ VST_SDK/VST3_SDK/pluginterfaces/base/funknown.cpp 2020-03-10 22:02:26.220911670 +0100
@@ -84,7 +84,7 @@
int32 PLUGIN_API atomicAdd (int32& var, int32 d)
{
#if SMTG_OS_WINDOWS
- return InterlockedExchangeAdd (&var, d) + d;
+ return InterlockedExchangeAdd ((LONG*)&var, d) + d;
#elif SMTG_OS_MACOS
#if SMTG_MACOS_USE_STDATOMIC
return atomic_fetch_add (reinterpret_cast<atomic_int_least32_t*> (&var), d) + d;

2
.travis/script_mingw.sh
View file

@ -12,7 +12,6 @@ if [[ ${CROSS_COMPILE} == "mingw32" ]]; then
-DSFIZZ_STATIC_LIBSNDFILE=ON \ -DSFIZZ_STATIC_LIBSNDFILE=ON \
-DCMAKE_CXX_STANDARD=17 \ -DCMAKE_CXX_STANDARD=17 \
.. ..
buildenv patch -p1 -i "$(pwd)"/../.travis/patches/vstsdk-3.6.14-mingw-atomic-add.diff -d ../vst/external/VST_SDK
buildenv make -j$(nproc) buildenv make -j$(nproc)
elif [[ ${CROSS_COMPILE} == "mingw64" ]]; then elif [[ ${CROSS_COMPILE} == "mingw64" ]]; then
buildenv x86_64-w64-mingw32-cmake -DCMAKE_BUILD_TYPE=Release \ buildenv x86_64-w64-mingw32-cmake -DCMAKE_BUILD_TYPE=Release \
@ -22,6 +21,5 @@ elif [[ ${CROSS_COMPILE} == "mingw64" ]]; then
-DSFIZZ_STATIC_LIBSNDFILE=ON \ -DSFIZZ_STATIC_LIBSNDFILE=ON \
-DCMAKE_CXX_STANDARD=17 \ -DCMAKE_CXX_STANDARD=17 \
.. ..
buildenv patch -p1 -i "$(pwd)"/../.travis/patches/vstsdk-3.6.14-mingw-atomic-add.diff -d ../vst/external/VST_SDK
buildenv make -j$(nproc) buildenv make -j$(nproc)
fi fi

2
vst/external/VST_SDK/VST3_SDK/pluginterfaces vendored

@ -1 +1 @@
Subproject commit 227ea1d8f749c6a66dd591582061d58682b4aa9f Subproject commit 8c07a58d84c544a73e1ccad2efae200505796773

2
vst/external/VST_SDK/VST3_SDK/public.sdk vendored

@ -1 +1 @@
Subproject commit c04e9bd690f50893742e2a082abab47af2c3efc8 Subproject commit ff836e8c02bd28c902f5e3e75353a86f65008a77