diff --git a/thirdparty/LibJPEG/jpeg-9/prj/LibJPEG/LibJPEG.vcxproj b/thirdparty/LibJPEG/jpeg-9/prj/LibJPEG/LibJPEG.vcxproj index 8f59ba2..70ba9d2 100644 --- a/thirdparty/LibJPEG/jpeg-9/prj/LibJPEG/LibJPEG.vcxproj +++ b/thirdparty/LibJPEG/jpeg-9/prj/LibJPEG/LibJPEG.vcxproj @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> +<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|Win32"> <Configuration>Debug</Configuration> @@ -27,23 +27,27 @@ <ConfigurationType>StaticLibrary</ConfigurationType> <UseDebugLibraries>true</UseDebugLibraries> <CharacterSet>MultiByte</CharacterSet> + <PlatformToolset>v120</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> <ConfigurationType>StaticLibrary</ConfigurationType> <UseDebugLibraries>true</UseDebugLibraries> <CharacterSet>MultiByte</CharacterSet> + <PlatformToolset>v120</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> <ConfigurationType>StaticLibrary</ConfigurationType> <UseDebugLibraries>false</UseDebugLibraries> <WholeProgramOptimization>true</WholeProgramOptimization> <CharacterSet>MultiByte</CharacterSet> + <PlatformToolset>v120</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> <ConfigurationType>StaticLibrary</ConfigurationType> <UseDebugLibraries>false</UseDebugLibraries> <WholeProgramOptimization>true</WholeProgramOptimization> <CharacterSet>MultiByte</CharacterSet> + <PlatformToolset>v120</PlatformToolset> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <ImportGroup Label="ExtensionSettings"> diff --git a/thirdparty/zlib/zlib-1.2.7/prj/zlib/zlib.vcxproj b/thirdparty/zlib/zlib-1.2.7/prj/zlib/zlib.vcxproj index b822dde..352d2f5 100644 --- a/thirdparty/zlib/zlib-1.2.7/prj/zlib/zlib.vcxproj +++ b/thirdparty/zlib/zlib-1.2.7/prj/zlib/zlib.vcxproj @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> +<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|Win32"> <Configuration>Debug</Configuration> @@ -27,23 +27,27 @@ <ConfigurationType>StaticLibrary</ConfigurationType> <UseDebugLibraries>true</UseDebugLibraries> <CharacterSet>MultiByte</CharacterSet> + <PlatformToolset>v120</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> <ConfigurationType>StaticLibrary</ConfigurationType> <UseDebugLibraries>true</UseDebugLibraries> <CharacterSet>MultiByte</CharacterSet> + <PlatformToolset>v120</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> <ConfigurationType>StaticLibrary</ConfigurationType> <UseDebugLibraries>false</UseDebugLibraries> <WholeProgramOptimization>true</WholeProgramOptimization> <CharacterSet>MultiByte</CharacterSet> + <PlatformToolset>v120</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> <ConfigurationType>StaticLibrary</ConfigurationType> <UseDebugLibraries>false</UseDebugLibraries> <WholeProgramOptimization>true</WholeProgramOptimization> <CharacterSet>MultiByte</CharacterSet> + <PlatformToolset>v120</PlatformToolset> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <ImportGroup Label="ExtensionSettings"> @@ -111,34 +115,34 @@ </Link> </ItemDefinitionGroup> <ItemGroup> - <ClInclude Include="..\..\..\..\..\..\depot\sdk\zlib\zlib-1.2.7\crc32.h" /> - <ClInclude Include="..\..\..\..\..\..\depot\sdk\zlib\zlib-1.2.7\deflate.h" /> - <ClInclude Include="..\..\..\..\..\..\depot\sdk\zlib\zlib-1.2.7\gzguts.h" /> - <ClInclude Include="..\..\..\..\..\..\depot\sdk\zlib\zlib-1.2.7\inffast.h" /> - <ClInclude Include="..\..\..\..\..\..\depot\sdk\zlib\zlib-1.2.7\inffixed.h" /> - <ClInclude Include="..\..\..\..\..\..\depot\sdk\zlib\zlib-1.2.7\inflate.h" /> - <ClInclude Include="..\..\..\..\..\..\depot\sdk\zlib\zlib-1.2.7\inftrees.h" /> - <ClInclude Include="..\..\..\..\..\..\depot\sdk\zlib\zlib-1.2.7\trees.h" /> - <ClInclude Include="..\..\..\..\..\..\depot\sdk\zlib\zlib-1.2.7\zconf.h" /> - <ClInclude Include="..\..\..\..\..\..\depot\sdk\zlib\zlib-1.2.7\zlib.h" /> - <ClInclude Include="..\..\..\..\..\..\depot\sdk\zlib\zlib-1.2.7\zutil.h" /> + <ClInclude Include="..\..\crc32.h" /> + <ClInclude Include="..\..\deflate.h" /> + <ClInclude Include="..\..\gzguts.h" /> + <ClInclude Include="..\..\inffast.h" /> + <ClInclude Include="..\..\inffixed.h" /> + <ClInclude Include="..\..\inflate.h" /> + <ClInclude Include="..\..\inftrees.h" /> + <ClInclude Include="..\..\trees.h" /> + <ClInclude Include="..\..\zconf.h" /> + <ClInclude Include="..\..\zlib.h" /> + <ClInclude Include="..\..\zutil.h" /> </ItemGroup> <ItemGroup> - <ClCompile Include="..\..\..\..\..\..\depot\sdk\zlib\zlib-1.2.7\adler32.c" /> - <ClCompile Include="..\..\..\..\..\..\depot\sdk\zlib\zlib-1.2.7\compress.c" /> - <ClCompile Include="..\..\..\..\..\..\depot\sdk\zlib\zlib-1.2.7\crc32.c" /> - <ClCompile Include="..\..\..\..\..\..\depot\sdk\zlib\zlib-1.2.7\deflate.c" /> - <ClCompile Include="..\..\..\..\..\..\depot\sdk\zlib\zlib-1.2.7\gzclose.c" /> - <ClCompile Include="..\..\..\..\..\..\depot\sdk\zlib\zlib-1.2.7\gzlib.c" /> - <ClCompile Include="..\..\..\..\..\..\depot\sdk\zlib\zlib-1.2.7\gzread.c" /> - <ClCompile Include="..\..\..\..\..\..\depot\sdk\zlib\zlib-1.2.7\gzwrite.c" /> - <ClCompile Include="..\..\..\..\..\..\depot\sdk\zlib\zlib-1.2.7\infback.c" /> - <ClCompile Include="..\..\..\..\..\..\depot\sdk\zlib\zlib-1.2.7\inffast.c" /> - <ClCompile Include="..\..\..\..\..\..\depot\sdk\zlib\zlib-1.2.7\inflate.c" /> - <ClCompile Include="..\..\..\..\..\..\depot\sdk\zlib\zlib-1.2.7\inftrees.c" /> - <ClCompile Include="..\..\..\..\..\..\depot\sdk\zlib\zlib-1.2.7\trees.c" /> - <ClCompile Include="..\..\..\..\..\..\depot\sdk\zlib\zlib-1.2.7\uncompr.c" /> - <ClCompile Include="..\..\..\..\..\..\depot\sdk\zlib\zlib-1.2.7\zutil.c" /> + <ClCompile Include="..\..\adler32.c" /> + <ClCompile Include="..\..\compress.c" /> + <ClCompile Include="..\..\crc32.c" /> + <ClCompile Include="..\..\deflate.c" /> + <ClCompile Include="..\..\gzclose.c" /> + <ClCompile Include="..\..\gzlib.c" /> + <ClCompile Include="..\..\gzread.c" /> + <ClCompile Include="..\..\gzwrite.c" /> + <ClCompile Include="..\..\infback.c" /> + <ClCompile Include="..\..\inffast.c" /> + <ClCompile Include="..\..\inflate.c" /> + <ClCompile Include="..\..\inftrees.c" /> + <ClCompile Include="..\..\trees.c" /> + <ClCompile Include="..\..\uncompr.c" /> + <ClCompile Include="..\..\zutil.c" /> </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <ImportGroup Label="ExtensionTargets">