From 1fa0e2a2d85bbef03e733635930fbba23038ab36 Mon Sep 17 00:00:00 2001
From: "yilun.zhang" <yilun.zhang@samsung.com>
Date: Wed, 26 Mar 2025 20:53:52 +0800
Subject: [PATCH] fix vs compile issue after merging arch patch

---
 code/win64/VS2022/iamf/iamf.vcxproj         | 18 +++---
 code/win64/VS2022/iamf/iamf.vcxproj.filters | 72 ++++++++++-----------
 2 files changed, 45 insertions(+), 45 deletions(-)

diff --git a/code/win64/VS2022/iamf/iamf.vcxproj b/code/win64/VS2022/iamf/iamf.vcxproj
index ad9a4fb1..8bb25f7e 100755
--- a/code/win64/VS2022/iamf/iamf.vcxproj
+++ b/code/win64/VS2022/iamf/iamf.vcxproj
@@ -133,13 +133,13 @@
     <ClCompile Include="..\..\..\src\common\fixedp11_5.c" />
     <ClCompile Include="..\..\..\src\iamf_dec\aac\aac_multistream_decoder.c" />
     <ClCompile Include="..\..\..\src\iamf_dec\aac\IAMF_aac_decoder.c" />
-    <ClCompile Include="..\..\..\src\iamf_dec\arch\arch_init.c" />
+    <ClCompile Include="..\..\..\src\iamf_dec\arch.c" />
     <ClCompile Include="..\..\..\src\iamf_dec\arch\arch_common.c" />
+    <ClCompile Include="..\..\..\src\iamf_dec\arch\arch_init.c" />
     <ClCompile Include="..\..\..\src\iamf_dec\arch\arm\arm_multiply_channels.c" />
     <ClCompile Include="..\..\..\src\iamf_dec\arch\arm\arm_zip_channels.c" />
     <ClCompile Include="..\..\..\src\iamf_dec\arch\arm\override_arm.c" />
     <ClCompile Include="..\..\..\src\iamf_dec\arch\x86\override_x86.c" />
-    <ClCompile Include="..\..\..\src\iamf_dec\arch.c" />
     <ClCompile Include="..\..\..\src\iamf_dec\audio_effect_peak_limiter.c" />
     <ClCompile Include="..\..\..\src\iamf_dec\bitstream.c" />
     <ClCompile Include="..\..\..\src\iamf_dec\demixer.c" />
@@ -174,13 +174,13 @@
     <ClInclude Include="..\..\..\src\common\IAMF_debug_dev.h" />
     <ClInclude Include="..\..\..\src\iamf_dec\aac\aac_multistream_decoder.h" />
     <ClInclude Include="..\..\..\src\iamf_dec\ae_rdr.h" />
-    <ClCompile Include="..\..\..\src\iamf_dec\arch\arch_init.h" />
-    <ClCompile Include="..\..\..\src\iamf_dec\arch\arch_common.h" />
-    <ClCompile Include="..\..\..\src\iamf_dec\arch\arm\arm_multiply_channels.h" />
-    <ClCompile Include="..\..\..\src\iamf_dec\arch\arm\arm_zip_channels.h" />
-    <ClCompile Include="..\..\..\src\iamf_dec\arch\arm\detect_arm.h" />
-    <ClCompile Include="..\..\..\src\iamf_dec\arch\x86\detect_x86.h" />
-    <ClCompile Include="..\..\..\src\iamf_dec\arch.h" />
+    <ClInclude Include="..\..\..\src\iamf_dec\arch.h" />
+    <ClInclude Include="..\..\..\src\iamf_dec\arch\arch_common.h" />
+    <ClInclude Include="..\..\..\src\iamf_dec\arch\arch_init.h" />
+    <ClInclude Include="..\..\..\src\iamf_dec\arch\arm\arm_multiply_channels.h" />
+    <ClInclude Include="..\..\..\src\iamf_dec\arch\arm\arm_zip_channels.h" />
+    <ClInclude Include="..\..\..\src\iamf_dec\arch\arm\detect_arm.h" />
+    <ClInclude Include="..\..\..\src\iamf_dec\arch\x86\detect_x86.h" />
     <ClInclude Include="..\..\..\src\iamf_dec\audio_effect_peak_limiter.h" />
     <ClInclude Include="..\..\..\src\iamf_dec\bitstream.h" />
     <ClInclude Include="..\..\..\src\iamf_dec\demixer.h" />
diff --git a/code/win64/VS2022/iamf/iamf.vcxproj.filters b/code/win64/VS2022/iamf/iamf.vcxproj.filters
index d6ecb6c1..114158d0 100755
--- a/code/win64/VS2022/iamf/iamf.vcxproj.filters
+++ b/code/win64/VS2022/iamf/iamf.vcxproj.filters
@@ -15,9 +15,6 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\..\src\iamf_dec\arch.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\src\iamf_dec\audio_effect_peak_limiter.c">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -72,18 +69,6 @@
     <ClCompile Include="..\..\..\src\iamf_dec\aac\IAMF_aac_decoder.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\src\iamf_dec\arch\arch_init.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\src\iamf_dec\arch\arch_common.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\src\iamf_dec\arch\arm\arm_multiply_channels.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\src\iamf_dec\arch\arm\arm_zip_channels.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\src\iamf_dec\arch\arm\override_arm.c">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -114,6 +99,21 @@
     <ClCompile Include="..\..\..\src\iamf_dec\IAMF_layout.c">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\..\src\iamf_dec\arch\arch_common.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\iamf_dec\arch\arch_init.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\iamf_dec\arch\arm\arm_zip_channels.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\iamf_dec\arch\arm\arm_multiply_channels.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\iamf_dec\arch.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\..\src\common\audio_defines.h">
@@ -137,27 +137,6 @@
     <ClInclude Include="..\..\..\src\iamf_dec\opus\opus_multistream2_decoder.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\src\iamf_dec\arch.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\src\iamf_dec\arch\arch_init.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\src\iamf_dec\arch\arch_common.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\src\iamf_dec\arch\arm\arm_multiply_channels.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\src\iamf_dec\arch\arm\arm_zip_channels.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\src\iamf_dec\arch\arm\detect_arm.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\src\iamf_dec\arch\x86\detect_x86.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\include\IAMF_decoder.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -212,5 +191,26 @@
     <ClInclude Include="..\..\..\src\iamf_dec\IAMF_layout.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\src\iamf_dec\arch\arch_common.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\iamf_dec\arch\arch_init.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\iamf_dec\arch\arm\detect_arm.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\iamf_dec\arch\arm\arm_zip_channels.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\iamf_dec\arch\arm\arm_multiply_channels.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\iamf_dec\arch\x86\detect_x86.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\iamf_dec\arch.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>
\ No newline at end of file