From 2af12f3c8a682e96432e062587b1d3899b0e3cb9 Mon Sep 17 00:00:00 2001
From: Ralph Giles <giles@mozilla.com>
Date: Wed, 21 Aug 2013 16:06:30 -0700
Subject: [PATCH] Fix relative paths the header file in the VS2010 projects.
This prevented opening the files from the 'Solution Explorer'
interface where the source listing is displayed. Thanks to
Koen Vos for reporting the issue.
---
win32/VS2010/opus.vcxproj.filters | 34 ++++++++++++-------------
win32/VS2010/silk_common.vcxproj | 42 +++++++++++++++----------------
win32/VS2010/silk_fixed.vcxproj | 8 +++---
win32/VS2010/silk_float.vcxproj | 8 +++---
4 files changed, 46 insertions(+), 46 deletions(-)
diff --git a/win32/VS2010/opus.vcxproj.filters b/win32/VS2010/opus.vcxproj.filters
index c3b95b86f..716077834 100644
--- a/win32/VS2010/opus.vcxproj.filters
+++ b/win32/VS2010/opus.vcxproj.filters
@@ -15,52 +15,52 @@
</Filter>
</ItemGroup>
<ItemGroup>
- <ClInclude Include="..\celt\arch.h">
+ <ClInclude Include="..\..\celt\arch.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="..\celt\celt.h">
+ <ClInclude Include="..\..\celt\celt.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="..\celt\entdec.h">
+ <ClInclude Include="..\..\celt\entdec.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="..\celt\entenc.h">
+ <ClInclude Include="..\..\celt\entenc.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="..\celt\float_cast.h">
+ <ClInclude Include="..\..\celt\float_cast.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="..\celt\os_support.h">
+ <ClInclude Include="..\..\celt\os_support.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="..\celt\stack_alloc.h">
+ <ClInclude Include="..\..\celt\stack_alloc.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="..\include\opus.h">
+ <ClInclude Include="..\..\include\opus.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="..\include\opus_defines.h">
+ <ClInclude Include="..\..\include\opus_defines.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="..\include\opus_types.h">
+ <ClInclude Include="..\..\include\opus_types.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="..\include\opus_multistream.h">
+ <ClInclude Include="..\..\include\opus_multistream.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="..\win32\config.h">
+ <ClInclude Include="..\..\win32\config.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="analysis.h">
+ <ClInclude Include="..\..\src\analysis.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="mlp.h">
+ <ClInclude Include="..\..\src\mlp.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="opus_private.h">
+ <ClInclude Include="..\..\src\opus_private.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="tansig_table.h">
+ <ClInclude Include="..\..\src\tansig_table.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
@@ -99,4 +99,4 @@
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/win32/VS2010/silk_common.vcxproj b/win32/VS2010/silk_common.vcxproj
index 275f1097e..a3b3c4ca9 100644
--- a/win32/VS2010/silk_common.vcxproj
+++ b/win32/VS2010/silk_common.vcxproj
@@ -213,26 +213,26 @@
<ItemGroup>
<ClInclude Include="..\include\opus_types.h" />
<ClInclude Include="..\win32\config.h" />
- <ClInclude Include="control.h" />
- <ClInclude Include="debug.h" />
- <ClInclude Include="define.h" />
- <ClInclude Include="errors.h" />
- <ClInclude Include="Inlines.h" />
- <ClInclude Include="MacroCount.h" />
- <ClInclude Include="MacroDebug.h" />
- <ClInclude Include="macros.h" />
- <ClInclude Include="main.h" />
- <ClInclude Include="pitch_est_defines.h" />
- <ClInclude Include="PLC.h" />
- <ClInclude Include="resampler_private.h" />
- <ClInclude Include="resampler_rom.h" />
- <ClInclude Include="resampler_structs.h" />
- <ClInclude Include="API.h" />
- <ClInclude Include="SigProc_FIX.h" />
- <ClInclude Include="structs.h" />
- <ClInclude Include="tables.h" />
- <ClInclude Include="tuning_parameters.h" />
- <ClInclude Include="typedef.h" />
+ <ClInclude Include="..\..\silk\control.h" />
+ <ClInclude Include="..\..\silk\debug.h" />
+ <ClInclude Include="..\..\silk\define.h" />
+ <ClInclude Include="..\..\silk\errors.h" />
+ <ClInclude Include="..\..\silk\Inlines.h" />
+ <ClInclude Include="..\..\silk\MacroCount.h" />
+ <ClInclude Include="..\..\silk\MacroDebug.h" />
+ <ClInclude Include="..\..\silk\macros.h" />
+ <ClInclude Include="..\..\silk\main.h" />
+ <ClInclude Include="..\..\silk\pitch_est_defines.h" />
+ <ClInclude Include="..\..\silk\PLC.h" />
+ <ClInclude Include="..\..\silk\resampler_private.h" />
+ <ClInclude Include="..\..\silk\resampler_rom.h" />
+ <ClInclude Include="..\..\silk\resampler_structs.h" />
+ <ClInclude Include="..\..\silk\API.h" />
+ <ClInclude Include="..\..\silk\SigProc_FIX.h" />
+ <ClInclude Include="..\..\silk\structs.h" />
+ <ClInclude Include="..\..\silk\tables.h" />
+ <ClInclude Include="..\..\silk\tuning_parameters.h" />
+ <ClInclude Include="..\..\silk\typedef.h" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\silk\A2NLSF.c" />
@@ -315,4 +315,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/win32/VS2010/silk_fixed.vcxproj b/win32/VS2010/silk_fixed.vcxproj
index 3d0e0fca0..5ea1a913b 100644
--- a/win32/VS2010/silk_fixed.vcxproj
+++ b/win32/VS2010/silk_fixed.vcxproj
@@ -161,9 +161,9 @@
<ItemGroup>
<ClInclude Include="..\..\include\opus_types.h" />
<ClInclude Include="..\..\win32\config.h" />
- <ClInclude Include="..\SigProc_FIX.h" />
- <ClInclude Include="main_FIX.h" />
- <ClInclude Include="structs_FIX.h" />
+ <ClInclude Include="..\..\silk\SigProc_FIX.h" />
+ <ClInclude Include="..\..\silk\fixed\main_FIX.h" />
+ <ClInclude Include="..\..\silk\fixed\structs_FIX.h" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\silk\fixed\apply_sine_window_FIX.c" />
@@ -195,4 +195,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/win32/VS2010/silk_float.vcxproj b/win32/VS2010/silk_float.vcxproj
index ec788d1f2..8c3879536 100644
--- a/win32/VS2010/silk_float.vcxproj
+++ b/win32/VS2010/silk_float.vcxproj
@@ -210,9 +210,9 @@
<ItemGroup>
<ClInclude Include="..\..\include\opus_types.h" />
<ClInclude Include="..\..\win32\config.h" />
- <ClInclude Include="main_FLP.h" />
- <ClInclude Include="SigProc_FLP.h" />
- <ClInclude Include="structs_FLP.h" />
+ <ClInclude Include="..\..\silk\float\main_FLP.h" />
+ <ClInclude Include="..\..\silk\float\SigProc_FLP.h" />
+ <ClInclude Include="..\..\silk\float\structs_FLP.h" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\silk\float\apply_sine_window_FLP.c" />
@@ -250,4 +250,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
--
GitLab