VS2010 fixes

FNA-XNA · Aug 9, 2020 · 188ec3a · 188ec3a
1 parent 9a83a66
commit 188ec3a
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 3 deletions.
diff --git 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
@@ -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
@@ -45,7 +45,7 @@
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
+      <SubSystem>Console</SubSystem>
       <AdditionalLibraryDirectories>..\..\..\SDL2\lib\x86\;..\$(Configuration)\</AdditionalLibraryDirectories>
       <AdditionalDependencies>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)</AdditionalDependencies>
     </Link>

diff --git a/visualc/uicommon/uicommon.vcxproj b/visualc/uicommon/uicommon.vcxproj
@@ -69,6 +69,7 @@
     <ClCompile Include="..\..\utils\uicommon\imgui.cpp" />
     <ClCompile Include="..\..\utils\uicommon\imgui_demo.cpp" />
     <ClCompile Include="..\..\utils\uicommon\imgui_draw.cpp" />
+    <ClCompile Include="..\..\utils\uicommon\imgui_widgets.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\utils\uicommon\glfuncs.h" />