diff options
| author | Joshua Bowman <silverbacknet@gmail.com> | 2012-10-23 23:18:38 +0400 |
|---|---|---|
| committer | Ralph Giles <giles@mozilla.com> | 2012-10-23 23:20:32 +0400 |
| commit | 3b60e81d794733e7af54ea1557f0879ec50286bd (patch) | |
| tree | 721224fad04eb9e422e5f119b0573772403fadbf | |
| parent | 027ec51bfef87d7e9f2c48091a66a75bcf524152 (diff) | |
Fix the MSVC build.
Updates the project files to include the new encoder source files.
Use OPUS_RESTRICT and include config.h to set the proper defines
for build under MSVC.
| -rw-r--r-- | src/analysis.c | 6 | ||||
| -rw-r--r-- | src/mlp.c | 3 | ||||
| -rw-r--r-- | src/opus.vcxproj | 7 | ||||
| -rw-r--r-- | src/opus.vcxproj.filters | 15 |
4 files changed, 27 insertions, 4 deletions
diff --git a/src/analysis.c b/src/analysis.c index 48832d5f..b3be892a 100644 --- a/src/analysis.c +++ b/src/analysis.c @@ -142,9 +142,9 @@ void tonality_analysis(TonalityAnalysisState *tonal, AnalysisInfo *info, CELTEnc const kiss_fft_state *kfft; kiss_fft_cpx in[480], out[480]; int N = 480, N2=240; - float * restrict A = tonal->angle; - float * restrict dA = tonal->d_angle; - float * restrict d2A = tonal->d2_angle; + float * OPUS_RESTRICT A = tonal->angle; + float * OPUS_RESTRICT dA = tonal->d_angle; + float * OPUS_RESTRICT d2A = tonal->d2_angle; float tonality[240]; float noisiness[240]; float band_tonality[NB_TBANDS]; @@ -25,6 +25,9 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include <math.h> #include "mlp.h" diff --git a/src/opus.vcxproj b/src/opus.vcxproj index a04d4c60..47074084 100644 --- a/src/opus.vcxproj +++ b/src/opus.vcxproj @@ -191,6 +191,9 @@ </CustomBuildStep>
</ItemDefinitionGroup>
<ItemGroup>
+ <ClCompile Include="analysis.c" />
+ <ClCompile Include="mlp.c" />
+ <ClCompile Include="mlp_data.c" />
<ClCompile Include="opus.c" />
<ClCompile Include="opus_decoder.c" />
<ClCompile Include="opus_encoder.c" />
@@ -210,9 +213,11 @@ <ClInclude Include="..\include\opus_types.h" />
<ClInclude Include="..\include\opus_multistream.h" />
<ClInclude Include="..\win32\config.h" />
+ <ClInclude Include="analysis.h" />
+ <ClInclude Include="mlp.h" />
<ClInclude Include="opus_private.h" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
-</Project>
\ No newline at end of file +</Project>
diff --git a/src/opus.vcxproj.filters b/src/opus.vcxproj.filters index 1d1cd84f..93d7a095 100644 --- a/src/opus.vcxproj.filters +++ b/src/opus.vcxproj.filters @@ -30,6 +30,15 @@ <ClCompile Include="opus_multistream.c"> <Filter>Source Files</Filter> </ClCompile> + <ClCompile Include="analysis.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="mlp.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="mlp_data.c"> + <Filter>Source Files</Filter> + </ClCompile> </ItemGroup> <ItemGroup> <ClInclude Include="..\win32\config.h"> @@ -71,5 +80,11 @@ <ClInclude Include="..\include\opus_multistream.h"> <Filter>Header Files</Filter> </ClInclude> + <ClInclude Include="analysis.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="mlp.h"> + <Filter>Header Files</Filter> + </ClInclude> </ItemGroup> </Project>
\ No newline at end of file |