Unified · Split
| @@ -5,23 +5,39 @@ · 4 unmodified lines | ||
| 5 | 5 | <Configuration>Debug</Configuration> |
| 6 | 6 | <Platform>Win32</Platform> |
| 7 | 7 | </ProjectConfiguration> |
| 8 | + <ProjectConfiguration Include="Debug|x64"> | |
| 9 | + <Configuration>Debug</Configuration> | |
| 10 | + <Platform>x64</Platform> | |
| 11 | + </ProjectConfiguration> | |
| 8 | 12 | <ProjectConfiguration Include="Release|Win32"> |
| 9 | 13 | <Configuration>Release</Configuration> |
| 10 | 14 | <Platform>Win32</Platform> |
| 11 | 15 | </ProjectConfiguration> |
| 16 | + <ProjectConfiguration Include="Release|x64"> | |
| 17 | + <Configuration>Release</Configuration> | |
| 18 | + <Platform>x64</Platform> | |
| 19 | + </ProjectConfiguration> | |
| 12 | 20 | </ItemGroup> |
| 13 | 21 | <PropertyGroup Label="Globals"> |
| 14 | 22 | <ProjectGuid>{2BD8CBB3-DFC9-4A6A-9B7A-07ED749BED58}</ProjectGuid> |
| 15 | − <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion> | |
| 23 | + <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion> | |
| 16 | 24 | </PropertyGroup> |
| 17 | 25 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> |
| 18 | 26 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> |
| 19 | 27 | <ConfigurationType>Application</ConfigurationType> |
| 20 | − <PlatformToolset>v141</PlatformToolset> | |
| 28 | + <PlatformToolset>v142</PlatformToolset> | |
| 29 | + </PropertyGroup> | |
| 30 | + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> | |
| 31 | + <ConfigurationType>Application</ConfigurationType> | |
| 32 | + <PlatformToolset>v142</PlatformToolset> | |
| 21 | 33 | </PropertyGroup> |
| 22 | 34 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> |
| 23 | 35 | <ConfigurationType>Application</ConfigurationType> |
| 24 | − <PlatformToolset>v141</PlatformToolset> | |
| 36 | + <PlatformToolset>v142</PlatformToolset> | |
| 37 | + </PropertyGroup> | |
| 38 | + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> | |
| 39 | + <ConfigurationType>Application</ConfigurationType> | |
| 40 | + <PlatformToolset>v142</PlatformToolset> | |
| 25 | 41 | </PropertyGroup> |
| 26 | 42 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> |
| 27 | 43 | <ImportGroup Label="ExtensionSettings"> |
| @@ -29,9 +45,15 @@ · 1 unmodified line | ||
| 29 | 45 | <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets"> |
| 30 | 46 | <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> |
| 31 | 47 | </ImportGroup> |
| 48 | + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets"> | |
| 49 | + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> | |
| 50 | + </ImportGroup> | |
| 32 | 51 | <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets"> |
| 33 | 52 | <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> |
| 34 | 53 | </ImportGroup> |
| 54 | + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets"> | |
| 55 | + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> | |
| 56 | + </ImportGroup> | |
| 35 | 57 | <PropertyGroup Label="UserMacros" /> |
| 36 | 58 | <PropertyGroup> |
| 37 | 59 | <_ProjectFileVersion>15.0.26730.12</_ProjectFileVersion> |
| @@ -44,6 +66,14 @@ · 6 unmodified lines | ||
| 44 | 66 | <CodeAnalysisRules /> |
| 45 | 67 | <CodeAnalysisRuleAssemblies /> |
| 46 | 68 | </PropertyGroup> |
| 69 | + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> | |
| 70 | + <OutDir>.\bin\$(Configuration)\</OutDir> | |
| 71 | + <IntDir>.\intermediate\$(Configuration)\$(ProjectName)\</IntDir> | |
| 72 | + <LinkIncremental>true</LinkIncremental> | |
| 73 | + <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet> | |
| 74 | + <CodeAnalysisRules /> | |
| 75 | + <CodeAnalysisRuleAssemblies /> | |
| 76 | + </PropertyGroup> | |
| 47 | 77 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> |
| 48 | 78 | <OutDir>.\bin\$(Configuration)\</OutDir> |
| 49 | 79 | <IntDir>.\intermediate\$(Configuration)\$(ProjectName)\</IntDir> |
| @@ -52,13 +82,21 @@ · 2 unmodified lines | ||
| 52 | 82 | <CodeAnalysisRules /> |
| 53 | 83 | <CodeAnalysisRuleAssemblies /> |
| 54 | 84 | </PropertyGroup> |
| 85 | + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> | |
| 86 | + <OutDir>.\bin\$(Configuration)\</OutDir> | |
| 87 | + <IntDir>.\intermediate\$(Configuration)\$(ProjectName)\</IntDir> | |
| 88 | + <LinkIncremental>false</LinkIncremental> | |
| 89 | + <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet> | |
| 90 | + <CodeAnalysisRules /> | |
| 91 | + <CodeAnalysisRuleAssemblies /> | |
| 92 | + </PropertyGroup> | |
| 55 | 93 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> |
| 56 | 94 | <Midl> |
| 57 | 95 | <TypeLibraryName>.\Debug/faad.tlb</TypeLibraryName> |
| 58 | 96 | </Midl> |
| 59 | 97 | <ClCompile> |
| 60 | 98 | <Optimization>Disabled</Optimization> |
| 61 | − <AdditionalIncludeDirectories>../../include;../../common/mp4ff;../../frontend;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | |
| 99 | + <AdditionalIncludeDirectories>../../include;../../frontend;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | |
| 62 | 100 | <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
| 63 | 101 | <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> |
| 64 | 102 | <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> |
| @@ -75,6 +113,30 @@ · 10 unmodified lines | ||
| 75 | 113 | <SubSystem>Console</SubSystem> |
| 76 | 114 | </Link> |
| 77 | 115 | </ItemDefinitionGroup> |
| 116 | + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> | |
| 117 | + <Midl> | |
| 118 | + <TypeLibraryName>.\Debug/faad.tlb</TypeLibraryName> | |
| 119 | + </Midl> | |
| 120 | + <ClCompile> | |
| 121 | + <Optimization>Disabled</Optimization> | |
| 122 | + <AdditionalIncludeDirectories>../../include;../../frontend;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | |
| 123 | + <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> | |
| 124 | + <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> | |
| 125 | + <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> | |
| 126 | + <PrecompiledHeader> | |
| 127 | + </PrecompiledHeader> | |
| 128 | + <WarningLevel>Level3</WarningLevel> | |
| 129 | + <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> | |
| 130 | + </ClCompile> | |
| 131 | + <ResourceCompile> | |
| 132 | + <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> | |
| 133 | + <Culture>0x0413</Culture> | |
| 134 | + </ResourceCompile> | |
| 135 | + <Link> | |
| 136 | + <GenerateDebugInformation>true</GenerateDebugInformation> | |
| 137 | + <SubSystem>Console</SubSystem> | |
| 138 | + </Link> | |
| 139 | + </ItemDefinitionGroup> | |
| 78 | 140 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> |
| 79 | 141 | <Midl> |
| 80 | 142 | <TypeLibraryName>.\Release/faad.tlb</TypeLibraryName> |
| @@ -84,7 +146,7 @@ · 3 unmodified lines | ||
| 84 | 146 | <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> |
| 85 | 147 | <IntrinsicFunctions>true</IntrinsicFunctions> |
| 86 | 148 | <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed> |
| 87 | − <AdditionalIncludeDirectories>../../include;../../common/mp4ff;../../frontend;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | |
| 149 | + <AdditionalIncludeDirectories>../../include;../../frontend;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | |
| 88 | 150 | <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
| 89 | 151 | <StringPooling>true</StringPooling> |
| 90 | 152 | <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> |
| @@ -100,6 +162,32 @@ · 9 unmodified lines | ||
| 100 | 162 | <SubSystem>Console</SubSystem> |
| 101 | 163 | </Link> |
| 102 | 164 | </ItemDefinitionGroup> |
| 165 | + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> | |
| 166 | + <Midl> | |
| 167 | + <TypeLibraryName>.\Release/faad.tlb</TypeLibraryName> | |
| 168 | + </Midl> | |
| 169 | + <ClCompile> | |
| 170 | + <Optimization>MinSpace</Optimization> | |
| 171 | + <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> | |
| 172 | + <IntrinsicFunctions>true</IntrinsicFunctions> | |
| 173 | + <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed> | |
| 174 | + <AdditionalIncludeDirectories>../../include;../../frontend;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | |
| 175 | + <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> | |
| 176 | + <StringPooling>true</StringPooling> | |
| 177 | + <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> | |
| 178 | + <FunctionLevelLinking>true</FunctionLevelLinking> | |
| 179 | + <PrecompiledHeader> | |
| 180 | + </PrecompiledHeader> | |
| 181 | + <WarningLevel>Level3</WarningLevel> | |
| 182 | + </ClCompile> | |
| 183 | + <ResourceCompile> | |
| 184 | + <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> | |
| 185 | + <Culture>0x0413</Culture> | |
| 186 | + </ResourceCompile> | |
| 187 | + <Link> | |
| 188 | + <SubSystem>Console</SubSystem> | |
| 189 | + </Link> | |
| 190 | + </ItemDefinitionGroup> | |
| 103 | 191 | <ItemGroup> |
| 104 | 192 | <ClCompile Include="..\..\frontend\audio.c" /> |
| 105 | 193 | <ClCompile Include="..\..\frontend\main.c" /> |
| @@ -108,7 +196,6 @@ · 2 unmodified lines | ||
| 108 | 196 | </ItemGroup> |
| 109 | 197 | <ItemGroup> |
| 110 | 198 | <ClInclude Include="..\..\frontend\getopt.h" /> |
| 111 | − <ClInclude Include="..\..\common\mp4v2\win32_ver.h" /> | |
| 112 | 199 | <ClInclude Include="..\..\frontend\mp4read.h" /> |
| 113 | 200 | <ClInclude Include="..\..\frontend\unicode_support.h" /> |
| 114 | 201 | <ClInclude Include="..\..\include\neaacdec.h" /> |
| @@ -34,9 +34,6 @@ · 33 unmodified lines | ||
| 34 | 34 | <ClInclude Include="..\..\include\neaacdec.h"> |
| 35 | 35 | <Filter>Header Files</Filter> |
| 36 | 36 | </ClInclude> |
| 37 | − <ClInclude Include="..\..\common\mp4v2\win32_ver.h"> | |
| 38 | − <Filter>Header Files</Filter> | |
| 39 | − </ClInclude> | |
| 40 | 37 | <ClInclude Include="..\..\frontend\mp4read.h"> |
| 41 | 38 | <Filter>Header Files</Filter> |
| 42 | 39 | </ClInclude> |
| @@ -1,6 +1,6 @@ | ||
| 1 | 1 | Microsoft Visual Studio Solution File, Format Version 12.00 |
| 2 | −# Visual Studio 15 | |
| 3 | −VisualStudioVersion = 15.0.27130.2010 | |
| 2 | +# Visual Studio Version 16 | |
| 3 | +VisualStudioVersion = 16.0.30114.105 | |
| 4 | 4 | MinimumVisualStudioVersion = 10.0.40219.1 |
| 5 | 5 | Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libfaad", "libfaad.vcxproj", "{BC3EFE27-9015-4C9C-AD3C-72B3B7ED2114}" |
| 6 | 6 | EndProject |
| @@ -11,21 +11,35 @@ EndProject · 4 unmodified lines | ||
| 11 | 11 | Global |
| 12 | 12 | GlobalSection(SolutionConfigurationPlatforms) = preSolution |
| 13 | 13 | Debug|Win32 = Debug|Win32 |
| 14 | + Debug|x64 = Debug|x64 | |
| 14 | 15 | Release|Win32 = Release|Win32 |
| 16 | + Release|x64 = Release|x64 | |
| 15 | 17 | EndGlobalSection |
| 16 | 18 | GlobalSection(ProjectConfigurationPlatforms) = postSolution |
| 17 | 19 | {BC3EFE27-9015-4C9C-AD3C-72B3B7ED2114}.Debug|Win32.ActiveCfg = Debug|Win32 |
| 18 | 20 | {BC3EFE27-9015-4C9C-AD3C-72B3B7ED2114}.Debug|Win32.Build.0 = Debug|Win32 |
| 21 | + {BC3EFE27-9015-4C9C-AD3C-72B3B7ED2114}.Debug|x64.ActiveCfg = Debug|x64 | |
| 22 | + {BC3EFE27-9015-4C9C-AD3C-72B3B7ED2114}.Debug|x64.Build.0 = Debug|x64 | |
| 19 | 23 | {BC3EFE27-9015-4C9C-AD3C-72B3B7ED2114}.Release|Win32.ActiveCfg = Release|Win32 |
| 20 | 24 | {BC3EFE27-9015-4C9C-AD3C-72B3B7ED2114}.Release|Win32.Build.0 = Release|Win32 |
| 25 | + {BC3EFE27-9015-4C9C-AD3C-72B3B7ED2114}.Release|x64.ActiveCfg = Release|x64 | |
| 26 | + {BC3EFE27-9015-4C9C-AD3C-72B3B7ED2114}.Release|x64.Build.0 = Release|x64 | |
| 21 | 27 | {482DA264-EE88-4575-B208-87C4CB80CD08}.Debug|Win32.ActiveCfg = Debug|Win32 |
| 22 | 28 | {482DA264-EE88-4575-B208-87C4CB80CD08}.Debug|Win32.Build.0 = Debug|Win32 |
| 29 | + {482DA264-EE88-4575-B208-87C4CB80CD08}.Debug|x64.ActiveCfg = Debug|x64 | |
| 30 | + {482DA264-EE88-4575-B208-87C4CB80CD08}.Debug|x64.Build.0 = Debug|x64 | |
| 23 | 31 | {482DA264-EE88-4575-B208-87C4CB80CD08}.Release|Win32.ActiveCfg = Release|Win32 |
| 24 | 32 | {482DA264-EE88-4575-B208-87C4CB80CD08}.Release|Win32.Build.0 = Release|Win32 |
| 33 | + {482DA264-EE88-4575-B208-87C4CB80CD08}.Release|x64.ActiveCfg = Release|x64 | |
| 34 | + {482DA264-EE88-4575-B208-87C4CB80CD08}.Release|x64.Build.0 = Release|x64 | |
| 25 | 35 | {2BD8CBB3-DFC9-4A6A-9B7A-07ED749BED58}.Debug|Win32.ActiveCfg = Debug|Win32 |
| 26 | 36 | {2BD8CBB3-DFC9-4A6A-9B7A-07ED749BED58}.Debug|Win32.Build.0 = Debug|Win32 |
| 37 | + {2BD8CBB3-DFC9-4A6A-9B7A-07ED749BED58}.Debug|x64.ActiveCfg = Debug|x64 | |
| 38 | + {2BD8CBB3-DFC9-4A6A-9B7A-07ED749BED58}.Debug|x64.Build.0 = Debug|x64 | |
| 27 | 39 | {2BD8CBB3-DFC9-4A6A-9B7A-07ED749BED58}.Release|Win32.ActiveCfg = Release|Win32 |
| 28 | 40 | {2BD8CBB3-DFC9-4A6A-9B7A-07ED749BED58}.Release|Win32.Build.0 = Release|Win32 |
| 41 | + {2BD8CBB3-DFC9-4A6A-9B7A-07ED749BED58}.Release|x64.ActiveCfg = Release|x64 | |
| 42 | + {2BD8CBB3-DFC9-4A6A-9B7A-07ED749BED58}.Release|x64.Build.0 = Release|x64 | |
| 29 | 43 | EndGlobalSection |
| 30 | 44 | GlobalSection(SolutionProperties) = preSolution |
| 31 | 45 | HideSolutionNode = FALSE |
| @@ -5,23 +5,39 @@ · 4 unmodified lines | ||
| 5 | 5 | <Configuration>Debug</Configuration> |
| 6 | 6 | <Platform>Win32</Platform> |
| 7 | 7 | </ProjectConfiguration> |
| 8 | + <ProjectConfiguration Include="Debug|x64"> | |
| 9 | + <Configuration>Debug</Configuration> | |
| 10 | + <Platform>x64</Platform> | |
| 11 | + </ProjectConfiguration> | |
| 8 | 12 | <ProjectConfiguration Include="Release|Win32"> |
| 9 | 13 | <Configuration>Release</Configuration> |
| 10 | 14 | <Platform>Win32</Platform> |
| 11 | 15 | </ProjectConfiguration> |
| 16 | + <ProjectConfiguration Include="Release|x64"> | |
| 17 | + <Configuration>Release</Configuration> | |
| 18 | + <Platform>x64</Platform> | |
| 19 | + </ProjectConfiguration> | |
| 12 | 20 | </ItemGroup> |
| 13 | 21 | <PropertyGroup Label="Globals"> |
| 14 | 22 | <ProjectGuid>{BC3EFE27-9015-4C9C-AD3C-72B3B7ED2114}</ProjectGuid> |
| 15 | − <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion> | |
| 23 | + <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion> | |
| 16 | 24 | </PropertyGroup> |
| 17 | 25 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> |
| 18 | 26 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> |
| 19 | 27 | <ConfigurationType>StaticLibrary</ConfigurationType> |
| 20 | − <PlatformToolset>v141</PlatformToolset> | |
| 28 | + <PlatformToolset>v142</PlatformToolset> | |
| 29 | + </PropertyGroup> | |
| 30 | + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> | |
| 31 | + <ConfigurationType>StaticLibrary</ConfigurationType> | |
| 32 | + <PlatformToolset>v142</PlatformToolset> | |
| 21 | 33 | </PropertyGroup> |
| 22 | 34 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> |
| 23 | 35 | <ConfigurationType>StaticLibrary</ConfigurationType> |
| 24 | − <PlatformToolset>v141</PlatformToolset> | |
| 36 | + <PlatformToolset>v142</PlatformToolset> | |
| 37 | + </PropertyGroup> | |
| 38 | + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> | |
| 39 | + <ConfigurationType>StaticLibrary</ConfigurationType> | |
| 40 | + <PlatformToolset>v142</PlatformToolset> | |
| 25 | 41 | </PropertyGroup> |
| 26 | 42 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> |
| 27 | 43 | <ImportGroup Label="ExtensionSettings"> |
| @@ -29,9 +45,15 @@ · 1 unmodified line | ||
| 29 | 45 | <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets"> |
| 30 | 46 | <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> |
| 31 | 47 | </ImportGroup> |
| 48 | + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets"> | |
| 49 | + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> | |
| 50 | + </ImportGroup> | |
| 32 | 51 | <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets"> |
| 33 | 52 | <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> |
| 34 | 53 | </ImportGroup> |
| 54 | + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets"> | |
| 55 | + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> | |
| 56 | + </ImportGroup> | |
| 35 | 57 | <PropertyGroup Label="UserMacros" /> |
| 36 | 58 | <PropertyGroup> |
| 37 | 59 | <_ProjectFileVersion>15.0.26730.12</_ProjectFileVersion> |
| @@ -43,6 +65,13 @@ · 5 unmodified lines | ||
| 43 | 65 | <CodeAnalysisRules /> |
| 44 | 66 | <CodeAnalysisRuleAssemblies /> |
| 45 | 67 | </PropertyGroup> |
| 68 | + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> | |
| 69 | + <OutDir>.\bin\$(Configuration)\</OutDir> | |
| 70 | + <IntDir>.\intermediate\$(Configuration)\$(ProjectName)\</IntDir> | |
| 71 | + <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet> | |
| 72 | + <CodeAnalysisRules /> | |
| 73 | + <CodeAnalysisRuleAssemblies /> | |
| 74 | + </PropertyGroup> | |
| 46 | 75 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> |
| 47 | 76 | <OutDir>.\bin\$(Configuration)\</OutDir> |
| 48 | 77 | <IntDir>.\intermediate\$(Configuration)\$(ProjectName)\</IntDir> |
| @@ -50,6 +79,13 @@ · 1 unmodified line | ||
| 50 | 79 | <CodeAnalysisRules /> |
| 51 | 80 | <CodeAnalysisRuleAssemblies /> |
| 52 | 81 | </PropertyGroup> |
| 82 | + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> | |
| 83 | + <OutDir>.\bin\$(Configuration)\</OutDir> | |
| 84 | + <IntDir>.\intermediate\$(Configuration)\$(ProjectName)\</IntDir> | |
| 85 | + <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet> | |
| 86 | + <CodeAnalysisRules /> | |
| 87 | + <CodeAnalysisRuleAssemblies /> | |
| 88 | + </PropertyGroup> | |
| 53 | 89 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> |
| 54 | 90 | <ClCompile> |
| 55 | 91 | <Optimization>MaxSpeed</Optimization> |
| @@ -74,6 +110,31 @@ · 18 unmodified lines | ||
| 74 | 110 | <Message>Retrieving package version...</Message> |
| 75 | 111 | </PreBuildEvent> |
| 76 | 112 | </ItemDefinitionGroup> |
| 113 | + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> | |
| 114 | + <ClCompile> | |
| 115 | + <Optimization>MaxSpeed</Optimization> | |
| 116 | + <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> | |
| 117 | + <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | |
| 118 | + <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;NDEBUG;WIN32;_LIB;HAVE_LRINTF;%(PreprocessorDefinitions)</PreprocessorDefinitions> | |
| 119 | + <StringPooling>true</StringPooling> | |
| 120 | + <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> | |
| 121 | + <FunctionLevelLinking>true</FunctionLevelLinking> | |
| 122 | + <PrecompiledHeader> | |
| 123 | + </PrecompiledHeader> | |
| 124 | + <WarningLevel>Level3</WarningLevel> | |
| 125 | + </ClCompile> | |
| 126 | + <ResourceCompile> | |
| 127 | + <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> | |
| 128 | + <Culture>0x0413</Culture> | |
| 129 | + </ResourceCompile> | |
| 130 | + <Lib /> | |
| 131 | + <PreBuildEvent> | |
| 132 | + <Command>"$(SolutionDir)..\..\utils\win32\ac2ver.exe" "faad2" "$(SolutionDir)..\..\configure.ac" > "$(SolutionDir)..\..\libfaad\win32_ver.h"</Command> | |
| 133 | + </PreBuildEvent> | |
| 134 | + <PreBuildEvent> | |
| 135 | + <Message>Retrieving package version...</Message> | |
| 136 | + </PreBuildEvent> | |
| 137 | + </ItemDefinitionGroup> | |
| 77 | 138 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> |
| 78 | 139 | <ClCompile> |
| 79 | 140 | <Optimization>Disabled</Optimization> |
| @@ -97,6 +158,30 @@ · 17 unmodified lines | ||
| 97 | 158 | <Message>Retrieving package version...</Message> |
| 98 | 159 | </PreBuildEvent> |
| 99 | 160 | </ItemDefinitionGroup> |
| 161 | + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> | |
| 162 | + <ClCompile> | |
| 163 | + <Optimization>Disabled</Optimization> | |
| 164 | + <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | |
| 165 | + <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_DEBUG;WIN32;_LIB;HAVE_LRINTF;%(PreprocessorDefinitions)</PreprocessorDefinitions> | |
| 166 | + <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> | |
| 167 | + <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> | |
| 168 | + <PrecompiledHeader> | |
| 169 | + </PrecompiledHeader> | |
| 170 | + <WarningLevel>Level3</WarningLevel> | |
| 171 | + <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> | |
| 172 | + </ClCompile> | |
| 173 | + <ResourceCompile> | |
| 174 | + <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> | |
| 175 | + <Culture>0x0413</Culture> | |
| 176 | + </ResourceCompile> | |
| 177 | + <Lib /> | |
| 178 | + <PreBuildEvent> | |
| 179 | + <Command>"$(SolutionDir)..\..\utils\win32\ac2ver.exe" "faad2" "$(SolutionDir)..\..\configure.ac" > "$(SolutionDir)..\..\libfaad\win32_ver.h"</Command> | |
| 180 | + </PreBuildEvent> | |
| 181 | + <PreBuildEvent> | |
| 182 | + <Message>Retrieving package version...</Message> | |
| 183 | + </PreBuildEvent> | |
| 184 | + </ItemDefinitionGroup> | |
| 100 | 185 | <ItemGroup> |
| 101 | 186 | <ClCompile Include="..\..\libfaad\bits.c" /> |
| 102 | 187 | <ClCompile Include="..\..\libfaad\cfft.c" /> |
| @@ -5,23 +5,39 @@ · 4 unmodified lines | ||
| 5 | 5 | <Configuration>Debug</Configuration> |
| 6 | 6 | <Platform>Win32</Platform> |
| 7 | 7 | </ProjectConfiguration> |
| 8 | + <ProjectConfiguration Include="Debug|x64"> | |
| 9 | + <Configuration>Debug</Configuration> | |
| 10 | + <Platform>x64</Platform> | |
| 11 | + </ProjectConfiguration> | |
| 8 | 12 | <ProjectConfiguration Include="Release|Win32"> |
| 9 | 13 | <Configuration>Release</Configuration> |
| 10 | 14 | <Platform>Win32</Platform> |
| 11 | 15 | </ProjectConfiguration> |
| 16 | + <ProjectConfiguration Include="Release|x64"> | |
| 17 | + <Configuration>Release</Configuration> | |
| 18 | + <Platform>x64</Platform> | |
| 19 | + </ProjectConfiguration> | |
| 12 | 20 | </ItemGroup> |
| 13 | 21 | <PropertyGroup Label="Globals"> |
| 14 | 22 | <ProjectGuid>{482DA264-EE88-4575-B208-87C4CB80CD08}</ProjectGuid> |
| 15 | − <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion> | |
| 23 | + <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion> | |
| 16 | 24 | </PropertyGroup> |
| 17 | 25 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> |
| 18 | 26 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> |
| 19 | 27 | <ConfigurationType>DynamicLibrary</ConfigurationType> |
| 20 | − <PlatformToolset>v141</PlatformToolset> | |
| 28 | + <PlatformToolset>v142</PlatformToolset> | |
| 29 | + </PropertyGroup> | |
| 30 | + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> | |
| 31 | + <ConfigurationType>DynamicLibrary</ConfigurationType> | |
| 32 | + <PlatformToolset>v142</PlatformToolset> | |
| 21 | 33 | </PropertyGroup> |
| 22 | 34 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> |
| 23 | 35 | <ConfigurationType>DynamicLibrary</ConfigurationType> |
| 24 | − <PlatformToolset>v141</PlatformToolset> | |
| 36 | + <PlatformToolset>v142</PlatformToolset> | |
| 37 | + </PropertyGroup> | |
| 38 | + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> | |
| 39 | + <ConfigurationType>DynamicLibrary</ConfigurationType> | |
| 40 | + <PlatformToolset>v142</PlatformToolset> | |
| 25 | 41 | </PropertyGroup> |
| 26 | 42 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> |
| 27 | 43 | <ImportGroup Label="ExtensionSettings"> |
| @@ -29,9 +45,15 @@ · 1 unmodified line | ||
| 29 | 45 | <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets"> |
| 30 | 46 | <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> |
| 31 | 47 | </ImportGroup> |
| 48 | + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets"> | |
| 49 | + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> | |
| 50 | + </ImportGroup> | |
| 32 | 51 | <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets"> |
| 33 | 52 | <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> |
| 34 | 53 | </ImportGroup> |
| 54 | + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets"> | |
| 55 | + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> | |
| 56 | + </ImportGroup> | |
| 35 | 57 | <PropertyGroup Label="UserMacros" /> |
| 36 | 58 | <PropertyGroup> |
| 37 | 59 | <_ProjectFileVersion>15.0.26730.12</_ProjectFileVersion> |
| @@ -44,6 +66,14 @@ · 6 unmodified lines | ||
| 44 | 66 | <CodeAnalysisRules /> |
| 45 | 67 | <CodeAnalysisRuleAssemblies /> |
| 46 | 68 | </PropertyGroup> |
| 69 | + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> | |
| 70 | + <OutDir>.\bin\$(Configuration)\</OutDir> | |
| 71 | + <IntDir>.\intermediate\$(Configuration)\$(ProjectName)\</IntDir> | |
| 72 | + <LinkIncremental>true</LinkIncremental> | |
| 73 | + <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet> | |
| 74 | + <CodeAnalysisRules /> | |
| 75 | + <CodeAnalysisRuleAssemblies /> | |
| 76 | + </PropertyGroup> | |
| 47 | 77 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> |
| 48 | 78 | <OutDir>.\bin\$(Configuration)\</OutDir> |
| 49 | 79 | <IntDir>.\intermediate\$(Configuration)\$(ProjectName)\</IntDir> |
| @@ -52,6 +82,14 @@ · 2 unmodified lines | ||
| 52 | 82 | <CodeAnalysisRules /> |
| 53 | 83 | <CodeAnalysisRuleAssemblies /> |
| 54 | 84 | </PropertyGroup> |
| 85 | + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> | |
| 86 | + <OutDir>.\bin\$(Configuration)\</OutDir> | |
| 87 | + <IntDir>.\intermediate\$(Configuration)\$(ProjectName)\</IntDir> | |
| 88 | + <LinkIncremental>false</LinkIncremental> | |
| 89 | + <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet> | |
| 90 | + <CodeAnalysisRules /> | |
| 91 | + <CodeAnalysisRuleAssemblies /> | |
| 92 | + </PropertyGroup> | |
| 55 | 93 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> |
| 56 | 94 | <Midl> |
| 57 | 95 | <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
| @@ -84,6 +122,38 @@ · 26 unmodified lines | ||
| 84 | 122 | <Command>"$(SolutionDir)..\..\utils\win32\ac2ver.exe" "faad2" "$(SolutionDir)..\..\configure.ac" > "$(SolutionDir)..\..\libfaad\win32_ver.h"</Command> |
| 85 | 123 | </PreBuildEvent> |
| 86 | 124 | </ItemDefinitionGroup> |
| 125 | + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> | |
| 126 | + <Midl> | |
| 127 | + <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> | |
| 128 | + <MkTypLibCompatible>true</MkTypLibCompatible> | |
| 129 | + <SuppressStartupBanner>true</SuppressStartupBanner> | |
| 130 | + <TypeLibraryName>.\DebugDLL/libfaad2_dll.tlb</TypeLibraryName> | |
| 131 | + </Midl> | |
| 132 | + <ClCompile> | |
| 133 | + <Optimization>Disabled</Optimization> | |
| 134 | + <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | |
| 135 | + <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_WINDOWS;_USRDLL;HAVE_LRINTF;%(PreprocessorDefinitions)</PreprocessorDefinitions> | |
| 136 | + <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> | |
| 137 | + <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> | |
| 138 | + <PrecompiledHeader> | |
| 139 | + </PrecompiledHeader> | |
| 140 | + <WarningLevel>Level3</WarningLevel> | |
| 141 | + <SuppressStartupBanner>true</SuppressStartupBanner> | |
| 142 | + <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> | |
| 143 | + </ClCompile> | |
| 144 | + <ResourceCompile> | |
| 145 | + <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> | |
| 146 | + <Culture>0x0407</Culture> | |
| 147 | + </ResourceCompile> | |
| 148 | + <Link> | |
| 149 | + <ModuleDefinitionFile>.\libfaad2.def</ModuleDefinitionFile> | |
| 150 | + <GenerateDebugInformation>true</GenerateDebugInformation> | |
| 151 | + </Link> | |
| 152 | + <PreBuildEvent> | |
| 153 | + <Message>Retrieving package version...</Message> | |
| 154 | + <Command>"$(SolutionDir)..\..\utils\win32\ac2ver.exe" "faad2" "$(SolutionDir)..\..\configure.ac" > "$(SolutionDir)..\..\libfaad\win32_ver.h"</Command> | |
| 155 | + </PreBuildEvent> | |
| 156 | + </ItemDefinitionGroup> | |
| 87 | 157 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> |
| 88 | 158 | <Midl> |
| 89 | 159 | <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
| @@ -117,6 +187,39 @@ · 27 unmodified lines | ||
| 117 | 187 | <Command>"$(SolutionDir)..\..\utils\win32\ac2ver.exe" "faad2" "$(SolutionDir)..\..\configure.ac" > "$(SolutionDir)..\..\libfaad\win32_ver.h"</Command> |
| 118 | 188 | </PreBuildEvent> |
| 119 | 189 | </ItemDefinitionGroup> |
| 190 | + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> | |
| 191 | + <Midl> | |
| 192 | + <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> | |
| 193 | + <MkTypLibCompatible>true</MkTypLibCompatible> | |
| 194 | + <SuppressStartupBanner>true</SuppressStartupBanner> | |
| 195 | + <TypeLibraryName>.\ReleaseDLL/libfaad2_dll.tlb</TypeLibraryName> | |
| 196 | + </Midl> | |
| 197 | + <ClCompile> | |
| 198 | + <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> | |
| 199 | + <IntrinsicFunctions>true</IntrinsicFunctions> | |
| 200 | + <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed> | |
| 201 | + <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_WINDOWS;_USRDLL;HAVE_LRINTF;%(PreprocessorDefinitions)</PreprocessorDefinitions> | |
| 202 | + <StringPooling>true</StringPooling> | |
| 203 | + <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> | |
| 204 | + <FunctionLevelLinking>true</FunctionLevelLinking> | |
| 205 | + <PrecompiledHeader> | |
| 206 | + </PrecompiledHeader> | |
| 207 | + <WarningLevel>Level3</WarningLevel> | |
| 208 | + <SuppressStartupBanner>true</SuppressStartupBanner> | |
| 209 | + <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | |
| 210 | + </ClCompile> | |
| 211 | + <ResourceCompile> | |
| 212 | + <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> | |
| 213 | + <Culture>0x0407</Culture> | |
| 214 | + </ResourceCompile> | |
| 215 | + <Link> | |
| 216 | + <ModuleDefinitionFile>.\libfaad2.def</ModuleDefinitionFile> | |
| 217 | + </Link> | |
| 218 | + <PreBuildEvent> | |
| 219 | + <Message>Retrieving package version...</Message> | |
| 220 | + <Command>"$(SolutionDir)..\..\utils\win32\ac2ver.exe" "faad2" "$(SolutionDir)..\..\configure.ac" > "$(SolutionDir)..\..\libfaad\win32_ver.h"</Command> | |
| 221 | + </PreBuildEvent> | |
| 222 | + </ItemDefinitionGroup> | |
| 120 | 223 | <ItemGroup> |
| 121 | 224 | <ClCompile Include="..\..\libfaad\bits.c" /> |
| 122 | 225 | <ClCompile Include="..\..\libfaad\cfft.c" /> |