diff --git a/thirdparty/libpng-1.6.21/.gitignore b/thirdparty/libpng-1.6.21/.gitignore new file mode 100644 index 0000000..20980d5 --- /dev/null +++ b/thirdparty/libpng-1.6.21/.gitignore @@ -0,0 +1 @@ +pnglibconf.h diff --git a/thirdparty/libpng-1.6.21/projects/vstudio/libpng/libpng.vcxproj b/thirdparty/libpng-1.6.21/projects/vstudio/libpng/libpng.vcxproj index de7fc3c..6820cf3 100644 --- a/thirdparty/libpng-1.6.21/projects/vstudio/libpng/libpng.vcxproj +++ b/thirdparty/libpng-1.6.21/projects/vstudio/libpng/libpng.vcxproj @@ -1,22 +1,38 @@ - - + + Debug Library Win32 + + Debug Library + x64 + Debug Win32 + + Debug + x64 + Release Library Win32 + + Release Library + x64 + Release Win32 + + Release + x64 + {D6973076-9317-4EF2-A0B8-B7A18AC0713E} @@ -29,19 +45,45 @@ DynamicLibrary MultiByte true + v120 + + + DynamicLibrary + MultiByte + true + v120 StaticLibrary MultiByte + v120 + + + StaticLibrary + MultiByte + v120 DynamicLibrary true MultiByte + v120 + + + DynamicLibrary + true + MultiByte + v120 StaticLibrary MultiByte + v120 + + + StaticLibrary + MultiByte + v120 @@ -49,15 +91,27 @@ + + + + + + + + + + + + false @@ -65,22 +119,42 @@ $(ProjectName)16 + + false + + $(ProjectName)16 + false $(ProjectName)16 + + false + + $(ProjectName)16 + false $(ProjectName)16 + + false + + $(ProjectName)16 + false $(ProjectName)16 + + false + + $(ProjectName)16 + Use @@ -111,6 +185,36 @@ $(OutDir) + + + Use + Level4 + false + ProgramDatabase + EnableFastChecks + WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) + true + true + false + false + pngpriv.h + true + CompileAsC + true + 4996;4127 + $(ZLibSrcDir);%(AdditionalIncludeDirectories) + true + Disabled + MultiThreadedDebugDLL + + + Windows + true + zlib.lib + 16 + $(OutDir) + + Use @@ -138,6 +242,33 @@ true + + + Use + Level4 + false + ProgramDatabase + Disabled + EnableFastChecks + WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + true + false + false + pngpriv.h + true + CompileAsC + true + 4996;4127 + $(ZLibSrcDir);%(AdditionalIncludeDirectories) + true + MultiThreadedDebug + + + Windows + true + + Level4 @@ -168,6 +299,36 @@ $(OutDir) + + + Level4 + Use + ProgramDatabase + true + true + WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) + false + false + pngpriv.h + true + CompileAsC + true + false + 4996;4127 + $(ZLibSrcDir);%(AdditionalIncludeDirectories) + true + Full + + + Windows + true + true + true + zlib.lib + 16 + $(OutDir) + + Level4 @@ -200,12 +361,48 @@ true + + + Level4 + Use + ProgramDatabase + MultiThreaded + true + true + WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) + false + false + pngpriv.h + true + CompileAsC + true + false + 4996;4127 + $(ZLibSrcDir);%(AdditionalIncludeDirectories) + true + Full + true + + + Windows + true + true + true + + + true + + Create + Create Create + Create Create + Create Create + Create @@ -225,10 +422,12 @@ true + true true + true - + \ No newline at end of file diff --git a/thirdparty/libpng-1.6.21/projects/vstudio/pnglibconf/pnglibconf.vcxproj b/thirdparty/libpng-1.6.21/projects/vstudio/pnglibconf/pnglibconf.vcxproj index e2a232c..47ad860 100644 --- a/thirdparty/libpng-1.6.21/projects/vstudio/pnglibconf/pnglibconf.vcxproj +++ b/thirdparty/libpng-1.6.21/projects/vstudio/pnglibconf/pnglibconf.vcxproj @@ -1,10 +1,14 @@ - - + + Release Win32 + + Release + x64 + {EB33566E-DA7F-4D28-9077-88C0B7C77E35} @@ -16,6 +20,14 @@ false true MultiByte + v120 + + + Application + false + true + MultiByte + v120 @@ -24,10 +36,16 @@ + + + Build + + Build + Level3 @@ -53,9 +71,34 @@ ..\..\..\scripts\pnglibconf.h.prebuilt + + + Level3 + MaxSpeed + true + true + + + true + true + true + + + copy ..\..\..\scripts\pnglibconf.h.prebuilt ..\..\..\pnglibconf.h + + + Generating pnglibconf.h + + + ..\..\..\pnglibconf.h + + + ..\..\..\scripts\pnglibconf.h.prebuilt + + - + \ No newline at end of file diff --git a/thirdparty/libpng-1.6.21/projects/vstudio/pngstest/pngstest.vcxproj b/thirdparty/libpng-1.6.21/projects/vstudio/pngstest/pngstest.vcxproj index 0d2980d..4eb7a21 100644 --- a/thirdparty/libpng-1.6.21/projects/vstudio/pngstest/pngstest.vcxproj +++ b/thirdparty/libpng-1.6.21/projects/vstudio/pngstest/pngstest.vcxproj @@ -1,22 +1,38 @@ - - + + Debug Library Win32 + + Debug Library + x64 + Debug Win32 + + Debug + x64 + Release Library Win32 + + Release Library + x64 + Release Win32 + + Release + x64 + {277AC57F-313B-4D06-B119-A3CDB672D2FF} @@ -28,18 +44,42 @@ Application Unicode + v120 + + + Application + Unicode + v120 Application Unicode + v120 + + + Application + Unicode + v120 Application Unicode + v120 + + + Application + Unicode + v120 Application Unicode + v120 + + + Application + Unicode + v120 @@ -47,32 +87,60 @@ + + + + + + + + + + + + false + + false + + false + + false + + false + + false + + false + + false + + NotUsing @@ -106,6 +174,39 @@ $(OutDir)pngstest.exe + + + NotUsing + Level4 + false + ProgramDatabase + Disabled + EnableFastChecks + WIN32;_DEBUG;_CONSOLE;PNG_USE_DLL;%(PreprocessorDefinitions) + $(ZLibSrcDir);..\..\..\scripts;%(AdditionalIncludeDirectories) + 4996;4127 + false + true + true + true + false + true + false + MultiThreadedDebugDLL + + + Console + true + libpng16.lib + $(OutDir) + + + Executing libpng simplified API test program + "$(OutDir)pngstest.exe" --strict --log --touch "$(IntDir)pngstest.out" ../../../contrib/pngsuite/basn0g01.png ../../../contrib/pngsuite/basn0g02.png ../../../contrib/pngsuite/basn0g04.png ../../../contrib/pngsuite/basn0g08.png ../../../contrib/pngsuite/basn0g16.png ../../../contrib/pngsuite/basn2c08.png ../../../contrib/pngsuite/basn2c16.png ../../../contrib/pngsuite/basn3p01.png ../../../contrib/pngsuite/basn3p02.png ../../../contrib/pngsuite/basn3p04.png ../../../contrib/pngsuite/basn3p08.png ../../../contrib/pngsuite/basn4a08.png ../../../contrib/pngsuite/basn4a16.png ../../../contrib/pngsuite/basn6a08.png ../../../contrib/pngsuite/basn6a16.png ../../../contrib/pngsuite/ftbbn0g01.png ../../../contrib/pngsuite/ftbbn0g02.png ../../../contrib/pngsuite/ftbbn0g04.png ../../../contrib/pngsuite/ftbbn2c16.png ../../../contrib/pngsuite/ftbbn3p08.png ../../../contrib/pngsuite/ftbgn2c16.png ../../../contrib/pngsuite/ftbgn3p08.png ../../../contrib/pngsuite/ftbrn2c08.png ../../../contrib/pngsuite/ftbwn0g16.png ../../../contrib/pngsuite/ftbwn3p08.png ../../../contrib/pngsuite/ftbyn3p08.png ../../../contrib/pngsuite/ftp0n0g08.png ../../../contrib/pngsuite/ftp0n2c08.png ../../../contrib/pngsuite/ftp0n3p08.png ../../../contrib/pngsuite/ftp1n3p08.png + $(IntDir)pngstest.out + $(OutDir)pngstest.exe + + NotUsing @@ -139,6 +240,39 @@ $(OutDir)pngstest.exe + + + NotUsing + Level4 + false + ProgramDatabase + Disabled + EnableFastChecks + MultiThreadedDebug + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + $(ZLibSrcDir);..\..\..\scripts;%(AdditionalIncludeDirectories) + 4996;4127 + false + true + true + true + false + true + false + + + Console + true + libpng16.lib;zlib.lib + $(OutDir) + + + Executing libpng simplified API test program + "$(OutDir)pngstest.exe" --strict --log --touch "$(IntDir)pngstest.out" ../../../contrib/pngsuite/basn0g01.png ../../../contrib/pngsuite/basn0g02.png ../../../contrib/pngsuite/basn0g04.png ../../../contrib/pngsuite/basn0g08.png ../../../contrib/pngsuite/basn0g16.png ../../../contrib/pngsuite/basn2c08.png ../../../contrib/pngsuite/basn2c16.png ../../../contrib/pngsuite/basn3p01.png ../../../contrib/pngsuite/basn3p02.png ../../../contrib/pngsuite/basn3p04.png ../../../contrib/pngsuite/basn3p08.png ../../../contrib/pngsuite/basn4a08.png ../../../contrib/pngsuite/basn4a16.png ../../../contrib/pngsuite/basn6a08.png ../../../contrib/pngsuite/basn6a16.png ../../../contrib/pngsuite/ftbbn0g01.png ../../../contrib/pngsuite/ftbbn0g02.png ../../../contrib/pngsuite/ftbbn0g04.png ../../../contrib/pngsuite/ftbbn2c16.png ../../../contrib/pngsuite/ftbbn3p08.png ../../../contrib/pngsuite/ftbgn2c16.png ../../../contrib/pngsuite/ftbgn3p08.png ../../../contrib/pngsuite/ftbrn2c08.png ../../../contrib/pngsuite/ftbwn0g16.png ../../../contrib/pngsuite/ftbwn3p08.png ../../../contrib/pngsuite/ftbyn3p08.png ../../../contrib/pngsuite/ftp0n0g08.png ../../../contrib/pngsuite/ftp0n2c08.png ../../../contrib/pngsuite/ftp0n3p08.png ../../../contrib/pngsuite/ftp1n3p08.png + $(IntDir)pngstest.out + $(OutDir)pngstest.exe + + Level4 @@ -174,6 +308,41 @@ $(OutDir)pngstest.exe + + + Level4 + NotUsing + ProgramDatabase + Full + false + true + WIN32;NDEBUG;_CONSOLE;PNG_USE_DLL;%(PreprocessorDefinitions) + $(ZLibSrcDir);..\..\..\scripts;%(AdditionalIncludeDirectories) + 4996;4127 + false + true + true + false + true + true + false + + + Console + true + true + true + libpng16.lib + $(OutDir) + UseLinkTimeCodeGeneration + + + Executing libpng simplified API test program + "$(OutDir)pngstest.exe" --strict --log --touch "$(IntDir)pngstest.out" ../../../contrib/pngsuite/basn0g01.png ../../../contrib/pngsuite/basn0g02.png ../../../contrib/pngsuite/basn0g04.png ../../../contrib/pngsuite/basn0g08.png ../../../contrib/pngsuite/basn0g16.png ../../../contrib/pngsuite/basn2c08.png ../../../contrib/pngsuite/basn2c16.png ../../../contrib/pngsuite/basn3p01.png ../../../contrib/pngsuite/basn3p02.png ../../../contrib/pngsuite/basn3p04.png ../../../contrib/pngsuite/basn3p08.png ../../../contrib/pngsuite/basn4a08.png ../../../contrib/pngsuite/basn4a16.png ../../../contrib/pngsuite/basn6a08.png ../../../contrib/pngsuite/basn6a16.png ../../../contrib/pngsuite/ftbbn0g01.png ../../../contrib/pngsuite/ftbbn0g02.png ../../../contrib/pngsuite/ftbbn0g04.png ../../../contrib/pngsuite/ftbbn2c16.png ../../../contrib/pngsuite/ftbbn3p08.png ../../../contrib/pngsuite/ftbgn2c16.png ../../../contrib/pngsuite/ftbgn3p08.png ../../../contrib/pngsuite/ftbrn2c08.png ../../../contrib/pngsuite/ftbwn0g16.png ../../../contrib/pngsuite/ftbwn3p08.png ../../../contrib/pngsuite/ftbyn3p08.png ../../../contrib/pngsuite/ftp0n0g08.png ../../../contrib/pngsuite/ftp0n2c08.png ../../../contrib/pngsuite/ftp0n3p08.png ../../../contrib/pngsuite/ftp1n3p08.png + $(IntDir)pngstest.out + $(OutDir)pngstest.exe + + Level4 @@ -210,10 +379,46 @@ $(OutDir)pngstest.exe + + + Level4 + NotUsing + ProgramDatabase + Full + MultiThreaded + false + true + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + $(ZLibSrcDir);..\..\..\scripts;%(AdditionalIncludeDirectories) + 4996;4127 + false + true + true + false + true + true + false + + + Console + true + true + true + libpng16.lib;zlib.lib + $(OutDir) + UseLinkTimeCodeGeneration + + + Executing libpng simplified API test program + "$(OutDir)pngstest.exe" --strict --log --touch "$(IntDir)pngstest.out" ../../../contrib/pngsuite/basn0g01.png ../../../contrib/pngsuite/basn0g02.png ../../../contrib/pngsuite/basn0g04.png ../../../contrib/pngsuite/basn0g08.png ../../../contrib/pngsuite/basn0g16.png ../../../contrib/pngsuite/basn2c08.png ../../../contrib/pngsuite/basn2c16.png ../../../contrib/pngsuite/basn3p01.png ../../../contrib/pngsuite/basn3p02.png ../../../contrib/pngsuite/basn3p04.png ../../../contrib/pngsuite/basn3p08.png ../../../contrib/pngsuite/basn4a08.png ../../../contrib/pngsuite/basn4a16.png ../../../contrib/pngsuite/basn6a08.png ../../../contrib/pngsuite/basn6a16.png ../../../contrib/pngsuite/ftbbn0g01.png ../../../contrib/pngsuite/ftbbn0g02.png ../../../contrib/pngsuite/ftbbn0g04.png ../../../contrib/pngsuite/ftbbn2c16.png ../../../contrib/pngsuite/ftbbn3p08.png ../../../contrib/pngsuite/ftbgn2c16.png ../../../contrib/pngsuite/ftbgn3p08.png ../../../contrib/pngsuite/ftbrn2c08.png ../../../contrib/pngsuite/ftbwn0g16.png ../../../contrib/pngsuite/ftbwn3p08.png ../../../contrib/pngsuite/ftbyn3p08.png ../../../contrib/pngsuite/ftp0n0g08.png ../../../contrib/pngsuite/ftp0n2c08.png ../../../contrib/pngsuite/ftp0n3p08.png ../../../contrib/pngsuite/ftp1n3p08.png + $(IntDir)pngstest.out + $(OutDir)pngstest.exe + + - + \ No newline at end of file diff --git a/thirdparty/libpng-1.6.21/projects/vstudio/pngtest/pngtest.vcxproj b/thirdparty/libpng-1.6.21/projects/vstudio/pngtest/pngtest.vcxproj index bf9266f..510f327 100644 --- a/thirdparty/libpng-1.6.21/projects/vstudio/pngtest/pngtest.vcxproj +++ b/thirdparty/libpng-1.6.21/projects/vstudio/pngtest/pngtest.vcxproj @@ -1,22 +1,38 @@ - - + + Debug Library Win32 + + Debug Library + x64 + Debug Win32 + + Debug + x64 + Release Library Win32 + + Release Library + x64 + Release Win32 + + Release + x64 + {228BA965-50D5-42B2-8BCF-AFCC227E3C1D} @@ -28,18 +44,42 @@ Application Unicode + v120 + + + Application + Unicode + v120 Application Unicode + v120 + + + Application + Unicode + v120 Application Unicode + v120 + + + Application + Unicode + v120 Application Unicode + v120 + + + Application + Unicode + v120 @@ -47,32 +87,60 @@ + + + + + + + + + + + + false + + false + + false + + false + + false + + false + + false + + false + + NotUsing @@ -106,6 +174,39 @@ ..\..\..\pngtest.png;$(OutDir)pngtest.exe + + + NotUsing + Level4 + false + ProgramDatabase + Disabled + EnableFastChecks + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + $(ZLibSrcDir);..\..\..\scripts;%(AdditionalIncludeDirectories) + 4996 + false + true + true + true + false + true + false + MultiThreadedDebugDLL + + + Console + true + libpng16.lib + $(OutDir) + + + Executing PNG test program + "$(OutDir)pngtest.exe" ..\..\..\pngtest.png "$(IntDir)pngout.png" + $(IntDir)pngout.png + ..\..\..\pngtest.png;$(OutDir)pngtest.exe + + NotUsing @@ -139,6 +240,39 @@ ..\..\..\pngtest.png;$(OutDir)pngtest.exe + + + NotUsing + Level4 + false + ProgramDatabase + Disabled + EnableFastChecks + MultiThreadedDebug + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + $(ZLibSrcDir);..\..\..\scripts;%(AdditionalIncludeDirectories) + 4996 + false + true + true + true + false + true + false + + + Console + true + libpng16.lib;zlib.lib + $(OutDir) + + + Executing PNG test program + "$(OutDir)pngtest.exe" ..\..\..\pngtest.png "$(IntDir)pngout.png" + $(IntDir)pngout.png + ..\..\..\pngtest.png;$(OutDir)pngtest.exe + + Level4 @@ -174,6 +308,41 @@ ..\..\..\pngtest.png;$(OutDir)pngtest.exe + + + Level4 + NotUsing + ProgramDatabase + Full + false + true + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + $(ZLibSrcDir);..\..\..\scripts;%(AdditionalIncludeDirectories) + 4996 + false + true + true + false + true + true + false + + + Console + true + true + true + UseLinkTimeCodeGeneration + libpng16.lib + $(OutDir) + + + Executing PNG test program + "$(OutDir)pngtest.exe" ..\..\..\pngtest.png "$(IntDir)pngout.png" + $(IntDir)pngout.png + ..\..\..\pngtest.png;$(OutDir)pngtest.exe + + Level4 @@ -211,10 +380,47 @@ ..\..\..\pngtest.png;$(OutDir)pngtest.exe + + + Level4 + NotUsing + ProgramDatabase + Full + MultiThreaded + false + true + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + $(ZLibSrcDir);..\..\..\scripts;%(AdditionalIncludeDirectories) + 4996 + false + true + true + false + true + true + false + + + Console + true + true + true + libpng16.lib;zlib.lib + UseLinkTimeCodeGeneration + $(OutDir) + + + Executing PNG test program + $(OutDir)pngtest.exe ..\..\..\pngtest.png $(IntDir)pngout.png + "$(OutDir)pngtest.exe" ..\..\..\pngtest.png "$(IntDir)pngout.png" + $(IntDir)pngout.png + ..\..\..\pngtest.png;$(OutDir)pngtest.exe + + - + \ No newline at end of file diff --git a/thirdparty/libpng-1.6.21/projects/vstudio/pngunknown/pngunknown.vcxproj b/thirdparty/libpng-1.6.21/projects/vstudio/pngunknown/pngunknown.vcxproj index a30cc7a..783e87f 100644 --- a/thirdparty/libpng-1.6.21/projects/vstudio/pngunknown/pngunknown.vcxproj +++ b/thirdparty/libpng-1.6.21/projects/vstudio/pngunknown/pngunknown.vcxproj @@ -1,22 +1,38 @@ - - + + Debug Library Win32 + + Debug Library + x64 + Debug Win32 + + Debug + x64 + Release Library Win32 + + Release Library + x64 + Release Win32 + + Release + x64 + {C5D3156C-8C8C-4936-B35F-2B829BA36FEC} @@ -28,18 +44,42 @@ Application Unicode + v120 + + + Application + Unicode + v120 Application Unicode + v120 + + + Application + Unicode + v120 Application Unicode + v120 + + + Application + Unicode + v120 Application Unicode + v120 + + + Application + Unicode + v120 @@ -47,32 +87,60 @@ + + + + + + + + + + + + false + + false + + false + + false + + false + + false + + false + + false + + NotUsing @@ -106,6 +174,39 @@ $(OutDir)pngunknown.exe + + + NotUsing + Level4 + false + ProgramDatabase + Disabled + EnableFastChecks + WIN32;_DEBUG;_CONSOLE;PNG_USE_DLL;%(PreprocessorDefinitions) + $(ZLibSrcDir);..\..\..\scripts;%(AdditionalIncludeDirectories) + 4996;4127 + false + true + true + true + false + true + false + MultiThreadedDebugDLL + + + Console + true + libpng16.lib + $(OutDir) + + + Executing PNG validation program + "$(OutDir)pngunknown.exe" --strict --default --touch "$(IntDir)pngunknown.out" ../../../pngtest.png + $(IntDir)pngunknown.out + $(OutDir)pngunknown.exe + + NotUsing @@ -139,6 +240,39 @@ $(OutDir)pngunknown.exe + + + NotUsing + Level4 + false + ProgramDatabase + Disabled + EnableFastChecks + MultiThreadedDebug + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + $(ZLibSrcDir);..\..\..\scripts;%(AdditionalIncludeDirectories) + 4996;4127 + false + true + true + true + false + true + false + + + Console + true + libpng16.lib;zlib.lib + $(OutDir) + + + Executing PNG validation program + "$(OutDir)pngunknown.exe" --strict --default --touch "$(IntDir)pngunknown.out" ../../../pngtest.png + $(IntDir)pngunknown.out + $(OutDir)pngunknown.exe + + Level4 @@ -174,6 +308,41 @@ $(OutDir)pngunknown.exe + + + Level4 + NotUsing + ProgramDatabase + Full + false + true + WIN32;NDEBUG;_CONSOLE;PNG_USE_DLL;%(PreprocessorDefinitions) + $(ZLibSrcDir);..\..\..\scripts;%(AdditionalIncludeDirectories) + 4996;4127 + false + true + true + false + true + true + false + + + Console + true + true + true + libpng16.lib + $(OutDir) + UseLinkTimeCodeGeneration + + + Executing PNG validation program + "$(OutDir)pngunknown.exe" --strict --default --touch "$(IntDir)pngunknown.out" ../../../pngtest.png + $(IntDir)pngunknown.out + $(OutDir)pngunknown.exe + + Level4 @@ -210,10 +379,46 @@ $(OutDir)pngunknown.exe + + + Level4 + NotUsing + ProgramDatabase + Full + MultiThreaded + false + true + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + $(ZLibSrcDir);..\..\..\scripts;%(AdditionalIncludeDirectories) + 4996;4127 + false + true + true + false + true + true + false + + + Console + true + true + true + libpng16.lib;zlib.lib + $(OutDir) + UseLinkTimeCodeGeneration + + + Executing PNG validation program + "$(OutDir)pngunknown.exe" --strict --default --touch "$(IntDir)pngunknown.out" ../../../pngtest.png + $(IntDir)pngunknown.out + $(OutDir)pngunknown.exe + + - + \ No newline at end of file diff --git a/thirdparty/libpng-1.6.21/projects/vstudio/pngvalid/pngvalid.vcxproj b/thirdparty/libpng-1.6.21/projects/vstudio/pngvalid/pngvalid.vcxproj index 07cf241..5495e91 100644 --- a/thirdparty/libpng-1.6.21/projects/vstudio/pngvalid/pngvalid.vcxproj +++ b/thirdparty/libpng-1.6.21/projects/vstudio/pngvalid/pngvalid.vcxproj @@ -1,22 +1,38 @@ - - + + Debug Library Win32 + + Debug Library + x64 + Debug Win32 + + Debug + x64 + Release Library Win32 + + Release Library + x64 + Release Win32 + + Release + x64 + {9B36B6FE-7FC0-434F-A71F-BBEF8099F1D8} @@ -28,18 +44,42 @@ Application Unicode + v120 + + + Application + Unicode + v120 Application Unicode + v120 + + + Application + Unicode + v120 Application Unicode + v120 + + + Application + Unicode + v120 Application Unicode + v120 + + + Application + Unicode + v120 @@ -47,32 +87,60 @@ + + + + + + + + + + + + false + + false + + false + + false + + false + + false + + false + + false + + NotUsing @@ -106,6 +174,39 @@ $(OutDir)pngvalid.exe + + + NotUsing + Level4 + false + ProgramDatabase + Disabled + EnableFastChecks + WIN32;_DEBUG;_CONSOLE;PNG_USE_DLL;%(PreprocessorDefinitions) + $(ZLibSrcDir);..\..\..\scripts;%(AdditionalIncludeDirectories) + 4996;4127 + false + true + true + true + false + true + false + MultiThreadedDebugDLL + + + Console + true + libpng16.lib;zlib.lib + $(OutDir) + + + Executing PNG validation program + "$(OutDir)pngvalid.exe" --touch "$(IntDir)pngvalid.out" + $(IntDir)pngvalid.out + $(OutDir)pngvalid.exe + + NotUsing @@ -139,6 +240,39 @@ $(OutDir)pngvalid.exe + + + NotUsing + Level4 + false + ProgramDatabase + Disabled + EnableFastChecks + MultiThreadedDebug + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + $(ZLibSrcDir);..\..\..\scripts;%(AdditionalIncludeDirectories) + 4996;4127 + false + true + true + true + false + true + false + + + Console + true + libpng16.lib;zlib.lib + $(OutDir) + + + Executing PNG validation program + "$(OutDir)pngvalid.exe" --touch "$(IntDir)pngvalid.out" + $(IntDir)pngvalid.out + $(OutDir)pngvalid.exe + + Level4 @@ -174,6 +308,41 @@ $(OutDir)pngvalid.exe + + + Level4 + NotUsing + ProgramDatabase + Full + false + true + WIN32;NDEBUG;_CONSOLE;PNG_USE_DLL;%(PreprocessorDefinitions) + $(ZLibSrcDir);..\..\..\scripts;%(AdditionalIncludeDirectories) + 4996;4127 + false + true + true + false + true + true + false + + + Console + true + true + true + libpng16.lib;zlib.lib + $(OutDir) + UseLinkTimeCodeGeneration + + + Executing PNG validation program + "$(OutDir)pngvalid.exe" --touch "$(IntDir)pngvalid.out" + $(IntDir)pngvalid.out + $(OutDir)pngvalid.exe + + Level4 @@ -210,10 +379,46 @@ $(OutDir)pngvalid.exe + + + Level4 + NotUsing + ProgramDatabase + Full + MultiThreaded + false + true + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + $(ZLibSrcDir);..\..\..\scripts;%(AdditionalIncludeDirectories) + 4996;4127 + false + true + true + false + true + true + false + + + Console + true + true + true + libpng16.lib;zlib.lib + $(OutDir) + UseLinkTimeCodeGeneration + + + Executing PNG validation program + "$(OutDir)pngvalid.exe" --touch "$(IntDir)pngvalid.out" + $(IntDir)pngvalid.out + $(OutDir)pngvalid.exe + + - + \ No newline at end of file diff --git a/thirdparty/libpng-1.6.21/projects/vstudio/vstudio.sln b/thirdparty/libpng-1.6.21/projects/vstudio/vstudio.sln index af0b1ba..952aed8 100644 --- a/thirdparty/libpng-1.6.21/projects/vstudio/vstudio.sln +++ b/thirdparty/libpng-1.6.21/projects/vstudio/vstudio.sln @@ -1,5 +1,7 @@ -Microsoft Visual Studio Solution File, Format Version 11.00 -# Visual Studio 2010 +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Express 2013 for Windows Desktop +VisualStudioVersion = 12.0.40629.0 +MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib", "zlib\zlib.vcxproj", "{60F89955-91C6-3A36-8000-13C592FEC2DF}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pnglibconf", "pnglibconf\pnglibconf.vcxproj", "{EB33566E-DA7F-4D28-9077-88C0B7C77E35}" @@ -41,67 +43,127 @@ EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug Library|Win32 = Debug Library|Win32 + Debug Library|x64 = Debug Library|x64 Debug|Win32 = Debug|Win32 + Debug|x64 = Debug|x64 Release Library|Win32 = Release Library|Win32 + Release Library|x64 = Release Library|x64 Release|Win32 = Release|Win32 + Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution + {60F89955-91C6-3A36-8000-13C592FEC2DF}.Debug Library|Win32.ActiveCfg = Debug Library|Win32 + {60F89955-91C6-3A36-8000-13C592FEC2DF}.Debug Library|Win32.Build.0 = Debug Library|Win32 + {60F89955-91C6-3A36-8000-13C592FEC2DF}.Debug Library|x64.ActiveCfg = Debug Library|x64 + {60F89955-91C6-3A36-8000-13C592FEC2DF}.Debug Library|x64.Build.0 = Debug Library|x64 + {60F89955-91C6-3A36-8000-13C592FEC2DF}.Debug|Win32.ActiveCfg = Debug|Win32 + {60F89955-91C6-3A36-8000-13C592FEC2DF}.Debug|Win32.Build.0 = Debug|Win32 + {60F89955-91C6-3A36-8000-13C592FEC2DF}.Debug|x64.ActiveCfg = Debug|x64 + {60F89955-91C6-3A36-8000-13C592FEC2DF}.Debug|x64.Build.0 = Debug|x64 + {60F89955-91C6-3A36-8000-13C592FEC2DF}.Release Library|Win32.ActiveCfg = Release Library|Win32 + {60F89955-91C6-3A36-8000-13C592FEC2DF}.Release Library|Win32.Build.0 = Release Library|Win32 + {60F89955-91C6-3A36-8000-13C592FEC2DF}.Release Library|x64.ActiveCfg = Release Library|x64 + {60F89955-91C6-3A36-8000-13C592FEC2DF}.Release Library|x64.Build.0 = Release Library|x64 + {60F89955-91C6-3A36-8000-13C592FEC2DF}.Release|Win32.ActiveCfg = Release|Win32 + {60F89955-91C6-3A36-8000-13C592FEC2DF}.Release|Win32.Build.0 = Release|Win32 + {60F89955-91C6-3A36-8000-13C592FEC2DF}.Release|x64.ActiveCfg = Release|x64 + {60F89955-91C6-3A36-8000-13C592FEC2DF}.Release|x64.Build.0 = Release|x64 + {EB33566E-DA7F-4D28-9077-88C0B7C77E35}.Debug Library|Win32.ActiveCfg = Release|Win32 + {EB33566E-DA7F-4D28-9077-88C0B7C77E35}.Debug Library|Win32.Build.0 = Release|Win32 + {EB33566E-DA7F-4D28-9077-88C0B7C77E35}.Debug Library|x64.ActiveCfg = Release|x64 + {EB33566E-DA7F-4D28-9077-88C0B7C77E35}.Debug Library|x64.Build.0 = Release|x64 + {EB33566E-DA7F-4D28-9077-88C0B7C77E35}.Debug|Win32.ActiveCfg = Release|Win32 + {EB33566E-DA7F-4D28-9077-88C0B7C77E35}.Debug|Win32.Build.0 = Release|Win32 + {EB33566E-DA7F-4D28-9077-88C0B7C77E35}.Debug|x64.ActiveCfg = Release|x64 + {EB33566E-DA7F-4D28-9077-88C0B7C77E35}.Debug|x64.Build.0 = Release|x64 + {EB33566E-DA7F-4D28-9077-88C0B7C77E35}.Release Library|Win32.ActiveCfg = Release|Win32 + {EB33566E-DA7F-4D28-9077-88C0B7C77E35}.Release Library|Win32.Build.0 = Release|Win32 + {EB33566E-DA7F-4D28-9077-88C0B7C77E35}.Release Library|x64.ActiveCfg = Release|x64 + {EB33566E-DA7F-4D28-9077-88C0B7C77E35}.Release Library|x64.Build.0 = Release|x64 + {EB33566E-DA7F-4D28-9077-88C0B7C77E35}.Release|Win32.ActiveCfg = Release|Win32 + {EB33566E-DA7F-4D28-9077-88C0B7C77E35}.Release|Win32.Build.0 = Release|Win32 + {EB33566E-DA7F-4D28-9077-88C0B7C77E35}.Release|x64.ActiveCfg = Release|x64 + {EB33566E-DA7F-4D28-9077-88C0B7C77E35}.Release|x64.Build.0 = Release|x64 {D6973076-9317-4EF2-A0B8-B7A18AC0713E}.Debug Library|Win32.ActiveCfg = Debug Library|Win32 {D6973076-9317-4EF2-A0B8-B7A18AC0713E}.Debug Library|Win32.Build.0 = Debug Library|Win32 + {D6973076-9317-4EF2-A0B8-B7A18AC0713E}.Debug Library|x64.ActiveCfg = Debug Library|x64 + {D6973076-9317-4EF2-A0B8-B7A18AC0713E}.Debug Library|x64.Build.0 = Debug Library|x64 {D6973076-9317-4EF2-A0B8-B7A18AC0713E}.Debug|Win32.ActiveCfg = Debug|Win32 {D6973076-9317-4EF2-A0B8-B7A18AC0713E}.Debug|Win32.Build.0 = Debug|Win32 + {D6973076-9317-4EF2-A0B8-B7A18AC0713E}.Debug|x64.ActiveCfg = Debug|x64 + {D6973076-9317-4EF2-A0B8-B7A18AC0713E}.Debug|x64.Build.0 = Debug|x64 {D6973076-9317-4EF2-A0B8-B7A18AC0713E}.Release Library|Win32.ActiveCfg = Release Library|Win32 {D6973076-9317-4EF2-A0B8-B7A18AC0713E}.Release Library|Win32.Build.0 = Release Library|Win32 + {D6973076-9317-4EF2-A0B8-B7A18AC0713E}.Release Library|x64.ActiveCfg = Release Library|x64 + {D6973076-9317-4EF2-A0B8-B7A18AC0713E}.Release Library|x64.Build.0 = Release Library|x64 {D6973076-9317-4EF2-A0B8-B7A18AC0713E}.Release|Win32.ActiveCfg = Release|Win32 {D6973076-9317-4EF2-A0B8-B7A18AC0713E}.Release|Win32.Build.0 = Release|Win32 + {D6973076-9317-4EF2-A0B8-B7A18AC0713E}.Release|x64.ActiveCfg = Release|x64 + {D6973076-9317-4EF2-A0B8-B7A18AC0713E}.Release|x64.Build.0 = Release|x64 {228BA965-50D5-42B2-8BCF-AFCC227E3C1D}.Debug Library|Win32.ActiveCfg = Debug Library|Win32 {228BA965-50D5-42B2-8BCF-AFCC227E3C1D}.Debug Library|Win32.Build.0 = Debug Library|Win32 + {228BA965-50D5-42B2-8BCF-AFCC227E3C1D}.Debug Library|x64.ActiveCfg = Debug Library|x64 + {228BA965-50D5-42B2-8BCF-AFCC227E3C1D}.Debug Library|x64.Build.0 = Debug Library|x64 {228BA965-50D5-42B2-8BCF-AFCC227E3C1D}.Debug|Win32.ActiveCfg = Debug|Win32 {228BA965-50D5-42B2-8BCF-AFCC227E3C1D}.Debug|Win32.Build.0 = Debug|Win32 + {228BA965-50D5-42B2-8BCF-AFCC227E3C1D}.Debug|x64.ActiveCfg = Debug|x64 + {228BA965-50D5-42B2-8BCF-AFCC227E3C1D}.Debug|x64.Build.0 = Debug|x64 {228BA965-50D5-42B2-8BCF-AFCC227E3C1D}.Release Library|Win32.ActiveCfg = Release Library|Win32 {228BA965-50D5-42B2-8BCF-AFCC227E3C1D}.Release Library|Win32.Build.0 = Release Library|Win32 + {228BA965-50D5-42B2-8BCF-AFCC227E3C1D}.Release Library|x64.ActiveCfg = Release Library|x64 + {228BA965-50D5-42B2-8BCF-AFCC227E3C1D}.Release Library|x64.Build.0 = Release Library|x64 {228BA965-50D5-42B2-8BCF-AFCC227E3C1D}.Release|Win32.ActiveCfg = Release|Win32 {228BA965-50D5-42B2-8BCF-AFCC227E3C1D}.Release|Win32.Build.0 = Release|Win32 - {60F89955-91C6-3A36-8000-13C592FEC2DF}.Debug Library|Win32.ActiveCfg = Debug Library|Win32 - {60F89955-91C6-3A36-8000-13C592FEC2DF}.Debug Library|Win32.Build.0 = Debug Library|Win32 - {60F89955-91C6-3A36-8000-13C592FEC2DF}.Debug|Win32.ActiveCfg = Debug|Win32 - {60F89955-91C6-3A36-8000-13C592FEC2DF}.Debug|Win32.Build.0 = Debug|Win32 - {60F89955-91C6-3A36-8000-13C592FEC2DF}.Release Library|Win32.ActiveCfg = Release Library|Win32 - {60F89955-91C6-3A36-8000-13C592FEC2DF}.Release Library|Win32.Build.0 = Release Library|Win32 - {60F89955-91C6-3A36-8000-13C592FEC2DF}.Release|Win32.ActiveCfg = Release|Win32 - {60F89955-91C6-3A36-8000-13C592FEC2DF}.Release|Win32.Build.0 = Release|Win32 + {228BA965-50D5-42B2-8BCF-AFCC227E3C1D}.Release|x64.ActiveCfg = Release|x64 + {228BA965-50D5-42B2-8BCF-AFCC227E3C1D}.Release|x64.Build.0 = Release|x64 {9B36B6FE-7FC0-434F-A71F-BBEF8099F1D8}.Debug Library|Win32.ActiveCfg = Debug Library|Win32 {9B36B6FE-7FC0-434F-A71F-BBEF8099F1D8}.Debug Library|Win32.Build.0 = Debug Library|Win32 + {9B36B6FE-7FC0-434F-A71F-BBEF8099F1D8}.Debug Library|x64.ActiveCfg = Debug Library|x64 + {9B36B6FE-7FC0-434F-A71F-BBEF8099F1D8}.Debug Library|x64.Build.0 = Debug Library|x64 {9B36B6FE-7FC0-434F-A71F-BBEF8099F1D8}.Debug|Win32.ActiveCfg = Debug|Win32 {9B36B6FE-7FC0-434F-A71F-BBEF8099F1D8}.Debug|Win32.Build.0 = Debug|Win32 + {9B36B6FE-7FC0-434F-A71F-BBEF8099F1D8}.Debug|x64.ActiveCfg = Debug|x64 + {9B36B6FE-7FC0-434F-A71F-BBEF8099F1D8}.Debug|x64.Build.0 = Debug|x64 {9B36B6FE-7FC0-434F-A71F-BBEF8099F1D8}.Release Library|Win32.ActiveCfg = Release Library|Win32 {9B36B6FE-7FC0-434F-A71F-BBEF8099F1D8}.Release Library|Win32.Build.0 = Release Library|Win32 + {9B36B6FE-7FC0-434F-A71F-BBEF8099F1D8}.Release Library|x64.ActiveCfg = Release Library|x64 + {9B36B6FE-7FC0-434F-A71F-BBEF8099F1D8}.Release Library|x64.Build.0 = Release Library|x64 {9B36B6FE-7FC0-434F-A71F-BBEF8099F1D8}.Release|Win32.ActiveCfg = Release|Win32 {9B36B6FE-7FC0-434F-A71F-BBEF8099F1D8}.Release|Win32.Build.0 = Release|Win32 - {EB33566E-DA7F-4D28-9077-88C0B7C77E35}.Debug Library|Win32.ActiveCfg = Release|Win32 - {EB33566E-DA7F-4D28-9077-88C0B7C77E35}.Debug Library|Win32.Build.0 = Release|Win32 - {EB33566E-DA7F-4D28-9077-88C0B7C77E35}.Debug|Win32.ActiveCfg = Release|Win32 - {EB33566E-DA7F-4D28-9077-88C0B7C77E35}.Debug|Win32.Build.0 = Release|Win32 - {EB33566E-DA7F-4D28-9077-88C0B7C77E35}.Release Library|Win32.ActiveCfg = Release|Win32 - {EB33566E-DA7F-4D28-9077-88C0B7C77E35}.Release Library|Win32.Build.0 = Release|Win32 - {EB33566E-DA7F-4D28-9077-88C0B7C77E35}.Release|Win32.ActiveCfg = Release|Win32 - {EB33566E-DA7F-4D28-9077-88C0B7C77E35}.Release|Win32.Build.0 = Release|Win32 + {9B36B6FE-7FC0-434F-A71F-BBEF8099F1D8}.Release|x64.ActiveCfg = Release|x64 + {9B36B6FE-7FC0-434F-A71F-BBEF8099F1D8}.Release|x64.Build.0 = Release|x64 {277AC57F-313B-4D06-B119-A3CDB672D2FF}.Debug Library|Win32.ActiveCfg = Debug Library|Win32 {277AC57F-313B-4D06-B119-A3CDB672D2FF}.Debug Library|Win32.Build.0 = Debug Library|Win32 + {277AC57F-313B-4D06-B119-A3CDB672D2FF}.Debug Library|x64.ActiveCfg = Debug Library|x64 + {277AC57F-313B-4D06-B119-A3CDB672D2FF}.Debug Library|x64.Build.0 = Debug Library|x64 {277AC57F-313B-4D06-B119-A3CDB672D2FF}.Debug|Win32.ActiveCfg = Debug|Win32 {277AC57F-313B-4D06-B119-A3CDB672D2FF}.Debug|Win32.Build.0 = Debug|Win32 + {277AC57F-313B-4D06-B119-A3CDB672D2FF}.Debug|x64.ActiveCfg = Debug|x64 + {277AC57F-313B-4D06-B119-A3CDB672D2FF}.Debug|x64.Build.0 = Debug|x64 {277AC57F-313B-4D06-B119-A3CDB672D2FF}.Release Library|Win32.ActiveCfg = Release Library|Win32 {277AC57F-313B-4D06-B119-A3CDB672D2FF}.Release Library|Win32.Build.0 = Release Library|Win32 + {277AC57F-313B-4D06-B119-A3CDB672D2FF}.Release Library|x64.ActiveCfg = Release Library|x64 + {277AC57F-313B-4D06-B119-A3CDB672D2FF}.Release Library|x64.Build.0 = Release Library|x64 {277AC57F-313B-4D06-B119-A3CDB672D2FF}.Release|Win32.ActiveCfg = Release|Win32 {277AC57F-313B-4D06-B119-A3CDB672D2FF}.Release|Win32.Build.0 = Release|Win32 + {277AC57F-313B-4D06-B119-A3CDB672D2FF}.Release|x64.ActiveCfg = Release|x64 + {277AC57F-313B-4D06-B119-A3CDB672D2FF}.Release|x64.Build.0 = Release|x64 {C5D3156C-8C8C-4936-B35F-2B829BA36FEC}.Debug Library|Win32.ActiveCfg = Debug Library|Win32 {C5D3156C-8C8C-4936-B35F-2B829BA36FEC}.Debug Library|Win32.Build.0 = Debug Library|Win32 + {C5D3156C-8C8C-4936-B35F-2B829BA36FEC}.Debug Library|x64.ActiveCfg = Debug Library|x64 + {C5D3156C-8C8C-4936-B35F-2B829BA36FEC}.Debug Library|x64.Build.0 = Debug Library|x64 {C5D3156C-8C8C-4936-B35F-2B829BA36FEC}.Debug|Win32.ActiveCfg = Debug|Win32 {C5D3156C-8C8C-4936-B35F-2B829BA36FEC}.Debug|Win32.Build.0 = Debug|Win32 + {C5D3156C-8C8C-4936-B35F-2B829BA36FEC}.Debug|x64.ActiveCfg = Debug|x64 + {C5D3156C-8C8C-4936-B35F-2B829BA36FEC}.Debug|x64.Build.0 = Debug|x64 {C5D3156C-8C8C-4936-B35F-2B829BA36FEC}.Release Library|Win32.ActiveCfg = Release Library|Win32 {C5D3156C-8C8C-4936-B35F-2B829BA36FEC}.Release Library|Win32.Build.0 = Release Library|Win32 + {C5D3156C-8C8C-4936-B35F-2B829BA36FEC}.Release Library|x64.ActiveCfg = Release Library|x64 + {C5D3156C-8C8C-4936-B35F-2B829BA36FEC}.Release Library|x64.Build.0 = Release Library|x64 {C5D3156C-8C8C-4936-B35F-2B829BA36FEC}.Release|Win32.ActiveCfg = Release|Win32 {C5D3156C-8C8C-4936-B35F-2B829BA36FEC}.Release|Win32.Build.0 = Release|Win32 + {C5D3156C-8C8C-4936-B35F-2B829BA36FEC}.Release|x64.ActiveCfg = Release|x64 + {C5D3156C-8C8C-4936-B35F-2B829BA36FEC}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/thirdparty/libpng-1.6.21/projects/vstudio/zlib/zlib.vcxproj b/thirdparty/libpng-1.6.21/projects/vstudio/zlib/zlib.vcxproj index 6e5b94a..04fc82c 100644 --- a/thirdparty/libpng-1.6.21/projects/vstudio/zlib/zlib.vcxproj +++ b/thirdparty/libpng-1.6.21/projects/vstudio/zlib/zlib.vcxproj @@ -1,22 +1,38 @@ - - + + Debug Library Win32 + + Debug Library + x64 + Debug Win32 + + Debug + x64 + Release Library Win32 + + Release Library + x64 + Release Win32 + + Release + x64 + @@ -40,18 +56,41 @@ StaticLibrary + v120 + + + StaticLibrary + v120 StaticLibrary + v120 + + + StaticLibrary + v120 StaticLibrary + v120 + + + StaticLibrary + v120 StaticLibrary + + StaticLibrary + StaticLibrary + v120 + + + StaticLibrary + v120 @@ -59,31 +98,58 @@ + + + + + + + + + + + + true + + true + true + + true + true + + true + true + + true + true + + true + WIN32;_DEBUG;_WINDOWS;Z_SOLO;%(PreprocessorDefinitions) @@ -100,6 +166,21 @@ Windows + + + WIN32;_DEBUG;_WINDOWS;Z_SOLO;%(PreprocessorDefinitions) + MultiThreadedDebug + TurnOffAllWarnings + ProgramDatabase + Disabled + true + true + + + true + Windows + + WIN32;_DEBUG;_WINDOWS;Z_SOLO;%(PreprocessorDefinitions) @@ -116,6 +197,21 @@ Windows + + + WIN32;_DEBUG;_WINDOWS;Z_SOLO;%(PreprocessorDefinitions) + TurnOffAllWarnings + ProgramDatabase + Disabled + true + true + MultiThreadedDebugDLL + + + true + Windows + + Level3 @@ -139,6 +235,28 @@ true + + + Level3 + ProgramDatabase + Full + true + true + false + true + true + true + MultiThreaded + WIN32;NDEBUG;_WINDOWS;Z_SOLO;%(PreprocessorDefinitions) + + + true + Windows + + + true + + Level3 @@ -163,7 +281,30 @@ true + + + Level3 + ProgramDatabase + Full + true + true + false + true + true + true + WIN32;NDEBUG;_WINDOWS;Z_SOLO;%(PreprocessorDefinitions) + + + true + Windows + true + true + + + true + + - + \ No newline at end of file