shithub: opus-tools

Download patch

ref: 8ecca2d9e08ebc0446b7bbb22911b57db9e46ea9
parent: 30f08a94f7021e60c86f55e496024b8fd7f898fc
author: Ricardo Constantino (:RiCON) <wiiaboo@gmail.com>
date: Tue Jul 26 18:18:08 EDT 2016 

VS2015: Add x64 target to solution.

Fix x64 include paths which were using previous directory hierarchy.

Signed-off-by: Ralph Giles <giles@thaumas.net>


--- a/win32/VS2015/opus-tools.sln
+++ b/win32/VS2015/opus-tools.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 14
-VisualStudioVersion = 14.0.25123.0
+VisualStudioVersion = 14.0.25420.1
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "opusdec", "opusdec.vcxproj", "{F2434089-C12F-D049-6D5E-19E75E1C68D2}"
 EndProject
@@ -12,21 +12,35 @@
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
+		Debug|x64 = Debug|x64
 		Release|Win32 = Release|Win32
+		Release|x64 = Release|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{F2434089-C12F-D049-6D5E-19E75E1C68D2}.Debug|Win32.ActiveCfg = Debug|Win32
 		{F2434089-C12F-D049-6D5E-19E75E1C68D2}.Debug|Win32.Build.0 = Debug|Win32
+		{F2434089-C12F-D049-6D5E-19E75E1C68D2}.Debug|x64.ActiveCfg = Debug|x64
+		{F2434089-C12F-D049-6D5E-19E75E1C68D2}.Debug|x64.Build.0 = Debug|x64
 		{F2434089-C12F-D049-6D5E-19E75E1C68D2}.Release|Win32.ActiveCfg = Release|Win32
 		{F2434089-C12F-D049-6D5E-19E75E1C68D2}.Release|Win32.Build.0 = Release|Win32
+		{F2434089-C12F-D049-6D5E-19E75E1C68D2}.Release|x64.ActiveCfg = Release|x64
+		{F2434089-C12F-D049-6D5E-19E75E1C68D2}.Release|x64.Build.0 = Release|x64
 		{02C9F2A5-2FE3-B16A-D0E1-FCAAEFC3B855}.Debug|Win32.ActiveCfg = Debug|Win32
 		{02C9F2A5-2FE3-B16A-D0E1-FCAAEFC3B855}.Debug|Win32.Build.0 = Debug|Win32
+		{02C9F2A5-2FE3-B16A-D0E1-FCAAEFC3B855}.Debug|x64.ActiveCfg = Debug|x64
+		{02C9F2A5-2FE3-B16A-D0E1-FCAAEFC3B855}.Debug|x64.Build.0 = Debug|x64
 		{02C9F2A5-2FE3-B16A-D0E1-FCAAEFC3B855}.Release|Win32.ActiveCfg = Release|Win32
 		{02C9F2A5-2FE3-B16A-D0E1-FCAAEFC3B855}.Release|Win32.Build.0 = Release|Win32
+		{02C9F2A5-2FE3-B16A-D0E1-FCAAEFC3B855}.Release|x64.ActiveCfg = Release|x64
+		{02C9F2A5-2FE3-B16A-D0E1-FCAAEFC3B855}.Release|x64.Build.0 = Release|x64
 		{BE460D7E-0DD8-81AC-FC4D-AB960C097EFE}.Debug|Win32.ActiveCfg = Debug|Win32
 		{BE460D7E-0DD8-81AC-FC4D-AB960C097EFE}.Debug|Win32.Build.0 = Debug|Win32
+		{BE460D7E-0DD8-81AC-FC4D-AB960C097EFE}.Debug|x64.ActiveCfg = Debug|x64
+		{BE460D7E-0DD8-81AC-FC4D-AB960C097EFE}.Debug|x64.Build.0 = Debug|x64
 		{BE460D7E-0DD8-81AC-FC4D-AB960C097EFE}.Release|Win32.ActiveCfg = Release|Win32
 		{BE460D7E-0DD8-81AC-FC4D-AB960C097EFE}.Release|Win32.Build.0 = Release|Win32
+		{BE460D7E-0DD8-81AC-FC4D-AB960C097EFE}.Release|x64.ActiveCfg = Release|x64
+		{BE460D7E-0DD8-81AC-FC4D-AB960C097EFE}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
--- a/win32/VS2015/opusdec.vcxproj
+++ b/win32/VS2015/opusdec.vcxproj
@@ -146,7 +146,7 @@
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..\ogg\include;..\..\..\opus\include;..\win32;..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\ogg\include;..\..\..\opus\include;..\..\win32;..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -204,7 +204,7 @@
       <PreprocessorDefinitions>WIN32;WIN64;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CONSOLE;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <WarningLevel>Level3</WarningLevel>
-      <AdditionalIncludeDirectories>..\..\..\ogg\include;..\..\..\opus\include;..\win32;..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\ogg\include;..\..\..\opus\include;..\..\win32;..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <FloatingPointModel>Fast</FloatingPointModel>
--- a/win32/VS2015/opusenc.vcxproj
+++ b/win32/VS2015/opusenc.vcxproj
@@ -148,7 +148,7 @@
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..\ogg\include;..\..\..\opus\include;..\win32;..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\ogg\include;..\..\..\opus\include;..\..\win32;..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -206,7 +206,7 @@
       <PreprocessorDefinitions>WIN32;WIN64;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CONSOLE;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <WarningLevel>Level3</WarningLevel>
-      <AdditionalIncludeDirectories>..\..\..\ogg\include;..\..\..\opus\include;..\win32;..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\ogg\include;..\..\..\opus\include;..\..\win32;..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <FloatingPointModel>Fast</FloatingPointModel>
--- a/win32/VS2015/opusinfo.vcxproj
+++ b/win32/VS2015/opusinfo.vcxproj
@@ -149,7 +149,7 @@
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..\ogg\include;..\..\..\opus\include;..\win32;..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\ogg\include;..\..\..\opus\include;..\..\win32;..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -207,7 +207,7 @@
       <PreprocessorDefinitions>WIN32;WIN64;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CONSOLE;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <WarningLevel>Level3</WarningLevel>
-      <AdditionalIncludeDirectories>..\..\..\ogg\include;..\..\..\opus\include;..\win32;..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\ogg\include;..\..\..\opus\include;..\..\win32;..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <FloatingPointModel>Fast</FloatingPointModel>