diff --git a/3rdparty/libpng/scripts/pnglibconf.h.prebuilt b/3rdparty/libpng/pnglibconf.h
similarity index 100%
rename from 3rdparty/libpng/scripts/pnglibconf.h.prebuilt
rename to 3rdparty/libpng/pnglibconf.h
diff --git a/3rdparty/libpng/projects/vstudio/libpng/libpng.vcxproj b/3rdparty/libpng/projects/vstudio/libpng/libpng_vs2012.vcxproj
similarity index 55%
rename from 3rdparty/libpng/projects/vstudio/libpng/libpng.vcxproj
rename to 3rdparty/libpng/projects/vstudio/libpng/libpng_vs2012.vcxproj
index 42195b5e85..42b48a81dc 100644
--- a/3rdparty/libpng/projects/vstudio/libpng/libpng.vcxproj
+++ b/3rdparty/libpng/projects/vstudio/libpng/libpng_vs2012.vcxproj
@@ -1,234 +1,176 @@
-
-
-
-
- Debug Library
- Win32
-
-
- Debug
- Win32
-
-
- Release Library
- Win32
-
-
- Release
- Win32
-
-
-
- {D6973076-9317-4EF2-A0B8-B7A18AC0713E}
- Win32Proj
- libpng
-
-
-
-
- DynamicLibrary
- MultiByte
- true
-
-
- StaticLibrary
- MultiByte
-
-
- DynamicLibrary
- true
- MultiByte
-
-
- StaticLibrary
- MultiByte
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- false
-
-
- $(ProjectName)16
-
-
- false
-
- $(ProjectName)16
-
-
- false
-
-
- $(ProjectName)16
-
-
- false
-
- $(ProjectName)16
-
-
-
- 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
- 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
- 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
- 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
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- true
- true
-
-
-
-
-
-
+
+
+
+
+ Debug
+ Win32
+
+
+ Devel
+ Win32
+
+
+ Release
+ Win32
+
+
+
+ libpng
+ {D6973076-9317-4EF2-A0B8-B7A18AC0713E}
+
+
+
+ StaticLibrary
+ Unicode
+ false
+ v110_xp
+
+
+ StaticLibrary
+ true
+ Unicode
+ v110_xp
+
+
+ StaticLibrary
+ true
+ Unicode
+ v110_xp
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ false
+
+
+
+
+ false
+
+
+
+
+ false
+
+
+
+
+ Use
+ Level4
+ ProgramDatabase
+ WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)
+ true
+ false
+ pngpriv.h
+ true
+ CompileAsC
+ 4996;4127
+ $(SolutionDir)\3rdparty\zlib;%(AdditionalIncludeDirectories)
+ true
+ Disabled
+
+
+ Windows
+ true
+ zlib.lib
+ 16
+ $(OutDir)
+
+
+
+
+ Level4
+ Use
+ ProgramDatabase
+ true
+ WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)
+ false
+ pngpriv.h
+ true
+ CompileAsC
+ 4996;4127
+ $(SolutionDir)\3rdparty\zlib;%(AdditionalIncludeDirectories)
+ true
+ Full
+
+
+ Windows
+ true
+ true
+ true
+ zlib.lib
+ 16
+ $(OutDir)
+
+
+
+
+ Level4
+ Use
+ ProgramDatabase
+ true
+ WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)
+ false
+ pngpriv.h
+ true
+ CompileAsC
+ 4996;4127
+ $(SolutionDir)\3rdparty\zlib;%(AdditionalIncludeDirectories)
+ true
+ Full
+
+
+ Windows
+ true
+ true
+ true
+ zlib.lib
+ 16
+ $(OutDir)
+
+
+
+
+ Create
+ Create
+ Create
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/3rdparty/libpng/projects/vstudio/libpng/libpng_vs2013.vcxproj b/3rdparty/libpng/projects/vstudio/libpng/libpng_vs2013.vcxproj
new file mode 100644
index 0000000000..5efcfd2bd4
--- /dev/null
+++ b/3rdparty/libpng/projects/vstudio/libpng/libpng_vs2013.vcxproj
@@ -0,0 +1,176 @@
+
+
+
+
+ Debug
+ Win32
+
+
+ Devel
+ Win32
+
+
+ Release
+ Win32
+
+
+
+ libpng
+ {D6973076-9317-4EF2-A0B8-B7A18AC0713E}
+
+
+
+ StaticLibrary
+ Unicode
+ false
+ v120_xp
+
+
+ StaticLibrary
+ true
+ Unicode
+ v120_xp
+
+
+ StaticLibrary
+ true
+ Unicode
+ v120_xp
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ false
+
+
+
+
+ false
+
+
+
+
+ false
+
+
+
+
+ Use
+ Level4
+ ProgramDatabase
+ WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)
+ true
+ false
+ pngpriv.h
+ true
+ CompileAsC
+ 4996;4127
+ $(SolutionDir)\3rdparty\zlib;%(AdditionalIncludeDirectories)
+ true
+ Disabled
+
+
+ Windows
+ true
+ zlib.lib
+ 16
+ $(OutDir)
+
+
+
+
+ Level4
+ Use
+ ProgramDatabase
+ true
+ WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)
+ false
+ pngpriv.h
+ true
+ CompileAsC
+ 4996;4127
+ $(SolutionDir)\3rdparty\zlib;%(AdditionalIncludeDirectories)
+ true
+ Full
+
+
+ Windows
+ true
+ true
+ true
+ zlib.lib
+ 16
+ $(OutDir)
+
+
+
+
+ Level4
+ Use
+ ProgramDatabase
+ true
+ WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)
+ false
+ pngpriv.h
+ true
+ CompileAsC
+ 4996;4127
+ $(SolutionDir)\3rdparty\zlib;%(AdditionalIncludeDirectories)
+ true
+ Full
+
+
+ Windows
+ true
+ true
+ true
+ zlib.lib
+ 16
+ $(OutDir)
+
+
+
+
+ Create
+ Create
+ Create
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+