shithub: opus-tools

Download patch

ref: b76939a3666406e7a82710bee6c56598e8ed35f6
parent: c2f685c83ddd0146d9707777d2fc8771b2dd8387
author: Ricardo Constantino <wiiaboo@gmail.com>
date: Mon Jan 1 19:53:06 EST 2018 

VS2015: prepare for new opusfile and libopusenc dependencies

Signed-off-by: Mark Harris <mark.hsj@gmail.com>


--- a/.gitattributes
+++ b/.gitattributes
@@ -2,3 +2,8 @@
 .gitattributes		export-ignore
 
 update_version		export-ignore
+
+*.sln text eol=crlf
+*.vcxproj text eol=crlf
+*.vcxproj.filters text eol=crlf
+*.bat text eol=crlf
--- a/win32/.gitignore
+++ b/win32/.gitignore
@@ -2,6 +2,7 @@
 [Dd]ebug/
 [Rr]elease/
 [Rr]eleases/
+.vs/
 *.manifest
 *.lastbuildstate
 *.lib
--- a/win32/VS2015/common.props
+++ b/win32/VS2015/common.props
@@ -23,7 +23,7 @@
       <CompileAsManaged>false</CompileAsManaged>

       <CompileAsWinRT>false</CompileAsWinRT>

       <AdditionalIncludeDirectories>..\..;..\..\include;..\..\silk;..\..\celt;..\..\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>HAVE_CONFIG_H;WIN32;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <PreprocessorDefinitions>HAVE_CONFIG_H;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <RuntimeTypeInfo>false</RuntimeTypeInfo>

       <OpenMPSupport>false</OpenMPSupport>

     </ClCompile>

--- a/win32/VS2015/opus-tools.props
+++ b/win32/VS2015/opus-tools.props
@@ -3,16 +3,16 @@
   <ImportGroup Label="PropertySheets" />
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
-    <LibraryPath>..\..\..\opus\win32\VS2015\$(Platform)\$(Configuration);..\..\..\ogg\win32\VS2015\$(Platform)\$(Configuration);$(LibraryPath)</LibraryPath>
+    <LibraryPath>..\..\..\opus\win32\VS2015\$(Platform)\$(Configuration);..\..\..\ogg\win32\VS2015\$(Platform)\$(Configuration);..\..\..\libopusenc\win32\VS2015\$(Platform)\$(Configuration);..\..\..\opusfile\win32\VS2015\$(Platform)\$(Configuration);..\..\..\openssl\$(Platform)\Release\lib;$(LibraryPath)</LibraryPath>
   </PropertyGroup>
   <ItemDefinitionGroup>
     <ClCompile>
-      <AdditionalIncludeDirectories>..\..\..\ogg\include;..\..\..\opus\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\ogg\include;..\..\..\libopusenc\include;..\..\..\opusfile\include;..\..\..\opus\include;..\..\..\openssl\$(Platform)\Release\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)'=='Debug' or '$(Configuration)'=='Release'">
     <Link>
-      <AdditionalDependencies>opus.lib;libogg_static.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>opus.lib;libogg_static.lib;opusfile.lib;opusenc.lib;libeay32.lib;ssleay32.lib;ws2_32.lib;crypt32.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup />
--- a/win32/VS2015/opusdec.vcxproj
+++ b/win32/VS2015/opusdec.vcxproj
@@ -32,7 +32,6 @@
     <ClCompile Include="..\..\src\flac.c" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\share\getopt.h" />
     <ClInclude Include="..\..\src\arch.h" />
     <ClInclude Include="..\..\src\cpusupport.h" />
     <ClInclude Include="..\..\src\diag_range.h" />
--- a/win32/VS2015/opusdec.vcxproj.filters
+++ b/win32/VS2015/opusdec.vcxproj.filters
@@ -85,8 +85,5 @@
     <ClInclude Include="..\..\src\cpusupport.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\share\getopt.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
   </ItemGroup>
 </Project>
--- a/win32/VS2015/opusenc.vcxproj
+++ b/win32/VS2015/opusenc.vcxproj
@@ -31,7 +31,6 @@
     <ClCompile Include="..\..\win32\unicode_support.c" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\share\getopt.h" />
     <ClInclude Include="..\..\src\arch.h" />
     <ClInclude Include="..\..\src\cpusupport.h" />
     <ClInclude Include="..\..\src\diag_range.h" />
--- a/win32/VS2015/opusenc.vcxproj.filters
+++ b/win32/VS2015/opusenc.vcxproj.filters
@@ -85,9 +85,6 @@
     <ClInclude Include="..\..\win32\unicode_support.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\share\getopt.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\src\cpusupport.h">
       <Filter>Header Files</Filter>
     </ClInclude>
--- a/win32/VS2015/opusinfo.vcxproj
+++ b/win32/VS2015/opusinfo.vcxproj
@@ -28,7 +28,6 @@
     <ClCompile Include="..\..\win32\unicode_support.c" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\share\getopt.h" />
     <ClInclude Include="..\..\src\info_opus.h" />
     <ClInclude Include="..\..\src\opusinfo.h" />
     <ClInclude Include="..\..\src\opus_header.h" />
--- a/win32/VS2015/opusinfo.vcxproj.filters
+++ b/win32/VS2015/opusinfo.vcxproj.filters
@@ -52,8 +52,5 @@
     <ClInclude Include="..\..\win32\unicode_support.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\share\getopt.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
   </ItemGroup>
 </Project>
\ No newline at end of file