From 188ec3af142ddd51065fa50da396173394c0400c Mon Sep 17 00:00:00 2001 From: Caleb Cornett Date: Sun, 9 Aug 2020 10:54:53 -0400 Subject: [PATCH] VS2010 fixes --- src/FAudioFX_reverb.c | 4 ++-- visualc/FAudio.sln | 13 +++++++++++++ visualc/testparse/testparse.vcxproj | 2 +- visualc/uicommon/uicommon.vcxproj | 1 + 4 files changed, 17 insertions(+), 3 deletions(-) diff --git a/src/FAudioFX_reverb.c b/src/FAudioFX_reverb.c index 975b42851..bd58a0683 100644 --- a/src/FAudioFX_reverb.c +++ b/src/FAudioFX_reverb.c @@ -1524,10 +1524,10 @@ uint32_t FAudioCreateReverbWithCustomAllocatorEXT( /* Allocate... */ FAudioFXReverb *result = (FAudioFXReverb*) customMalloc(sizeof(FAudioFXReverb)); - result->apiVersion = 7; uint8_t *params = (uint8_t*) customMalloc( sizeof(FAudioFXReverbParameters) * 3 ); + result->apiVersion = 7; #define INITPARAMS(offset) \ FAudio_memcpy( \ params + sizeof(FAudioFXReverbParameters) * offset, \ @@ -1697,10 +1697,10 @@ uint32_t FAudioCreateReverb9WithCustomAllocatorEXT( /* Allocate... */ FAudioFXReverb *result = (FAudioFXReverb*) customMalloc(sizeof(FAudioFXReverb)); - result->apiVersion = 9; uint8_t *params = (uint8_t*) customMalloc( sizeof(FAudioFXReverbParameters9) * 3 ); + result->apiVersion = 9; #define INITPARAMS(offset) \ FAudio_memcpy( \ params + sizeof(FAudioFXReverbParameters9) * offset, \ diff --git a/visualc/FAudio.sln b/visualc/FAudio.sln index a8c9eae65..e9aa6157c 100644 --- a/visualc/FAudio.sln +++ b/visualc/FAudio.sln @@ -6,12 +6,25 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "uicommon", "uicommon\uicommon.vcxproj", "{CE9051AA-CDC3-49FF-9205-0D10634B7E72}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "facttool", "facttool\facttool.vcxproj", "{47D440CF-668F-402E-8E7D-BD8096041C67}" + ProjectSection(ProjectDependencies) = postProject + {CE9051AA-CDC3-49FF-9205-0D10634B7E72} = {CE9051AA-CDC3-49FF-9205-0D10634B7E72} + {90A103EF-E403-47D4-BBBB-0F206B9FA7F2} = {90A103EF-E403-47D4-BBBB-0F206B9FA7F2} + EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testfilter", "testfilter\testfilter.vcxproj", "{EF66091E-EF11-4F72-9D9C-1D86D1805BA1}" + ProjectSection(ProjectDependencies) = postProject + {90A103EF-E403-47D4-BBBB-0F206B9FA7F2} = {90A103EF-E403-47D4-BBBB-0F206B9FA7F2} + EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testparse", "testparse\testparse.vcxproj", "{8B580628-C6E3-4AEC-BF33-5465614B657F}" + ProjectSection(ProjectDependencies) = postProject + {90A103EF-E403-47D4-BBBB-0F206B9FA7F2} = {90A103EF-E403-47D4-BBBB-0F206B9FA7F2} + EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testreverb", "testreverb\testreverb.vcxproj", "{6EF66F27-D775-45BC-B054-FEE95E408070}" + ProjectSection(ProjectDependencies) = postProject + {90A103EF-E403-47D4-BBBB-0F206B9FA7F2} = {90A103EF-E403-47D4-BBBB-0F206B9FA7F2} + EndProjectSection EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/visualc/testparse/testparse.vcxproj b/visualc/testparse/testparse.vcxproj index ba385cbf3..3ddd26a49 100644 --- a/visualc/testparse/testparse.vcxproj +++ b/visualc/testparse/testparse.vcxproj @@ -45,7 +45,7 @@ true - Windows + Console ..\..\..\SDL2\lib\x86\;..\$(Configuration)\ FAudio.lib;SDL2.lib;SDL2main.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) diff --git a/visualc/uicommon/uicommon.vcxproj b/visualc/uicommon/uicommon.vcxproj index 1c5ed8c87..61b8efc89 100644 --- a/visualc/uicommon/uicommon.vcxproj +++ b/visualc/uicommon/uicommon.vcxproj @@ -69,6 +69,7 @@ +