From 7e0eb8683c6122fbe584d832d487f2f4222a1e52 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20Feh=C3=A9r?= Date: Mon, 29 Feb 2016 21:38:52 +0100 Subject: [PATCH 1/2] fix -Wmissing-field-initializer (3 occurences) --- src/effects/VST/VSTEffect.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/effects/VST/VSTEffect.cpp b/src/effects/VST/VSTEffect.cpp index 51c8fda17..ef639e2a6 100644 --- a/src/effects/VST/VSTEffect.cpp +++ b/src/effects/VST/VSTEffect.cpp @@ -2334,7 +2334,7 @@ bool VSTEffect::LoadParameters(const wxString & group) { wxString value; - VstPatchChunkInfo info = {1, mAEffect->uniqueID, mAEffect->version, mAEffect->numParams}; + VstPatchChunkInfo info = {1, mAEffect->uniqueID, mAEffect->version, mAEffect->numParams, ""}; mHost->GetPrivateConfig(group, wxT("UniqueID"), info.pluginUniqueID, info.pluginUniqueID); mHost->GetPrivateConfig(group, wxT("Version"), info.pluginVersion, info.pluginVersion); mHost->GetPrivateConfig(group, wxT("Elements"), info.numElements, info.numElements); @@ -3129,7 +3129,8 @@ bool VSTEffect::LoadFXB(const wxFileName & fn) 1, wxINT32_SWAP_ON_LE(iptr[4]), wxINT32_SWAP_ON_LE(iptr[5]), - wxINT32_SWAP_ON_LE(iptr[6]) + wxINT32_SWAP_ON_LE(iptr[6]), + "" }; // Ensure this program looks to belong to the current plugin @@ -3323,7 +3324,8 @@ bool VSTEffect::LoadFXProgram(unsigned char **bptr, ssize_t & len, int index, bo 1, wxINT32_SWAP_ON_LE(iptr[4]), wxINT32_SWAP_ON_LE(iptr[5]), - wxINT32_SWAP_ON_LE(iptr[6]) + wxINT32_SWAP_ON_LE(iptr[6]), + "" }; // Ensure this program looks to belong to the current plugin From 9301b155cf0bdf27f080c2ff4587dba7e57891ca Mon Sep 17 00:00:00 2001 From: Leland Lucius Date: Wed, 2 Mar 2016 00:05:50 -0600 Subject: [PATCH 2/2] Get past the missing "memory" include file issue (part of bug #1344) This doesn't provide a complete fix for bug #1344, just gets around the missing "memory" include file portion of it. --- mac/scripts/create_info_header.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mac/scripts/create_info_header.sh b/mac/scripts/create_info_header.sh index d53451c0a..15aa10999 100755 --- a/mac/scripts/create_info_header.sh +++ b/mac/scripts/create_info_header.sh @@ -20,7 +20,7 @@ done # cd ${TOPLEVEL} mkdir -p mac/build -eval $(gcc -E -dM src/Audacity.h | awk '/#define *AUDACITY_(VERSION|RELEASE|REVISION|MODLEVEL) /{print $2 "=" $3}') +eval $(g++ -E -dM src/Audacity.h | awk '/#define *AUDACITY_(VERSION|RELEASE|REVISION|MODLEVEL) /{print $2 "=" $3}') cat >mac/build/Info.plist.h <