diff options
author | Glenn Randers-Pehrson <glennrp at users.sourceforge.net> | 2013-01-23 20:59:12 -0600 |
---|---|---|
committer | Glenn Randers-Pehrson <glennrp at users.sourceforge.net> | 2013-02-02 17:14:54 -0600 |
commit | d14caad2e9c46d02403e9db167a1daa8b59954b6 (patch) | |
tree | 9ca070f73068740683685ad983373dfe0102e7a5 /projects | |
parent | c2ac10b502f9cdf932d13a15e98d8810477180a1 (diff) | |
download | libpng-d14caad2e9c46d02403e9db167a1daa8b59954b6.tar.gz |
[master] Imported from libpng-1.5.14.tar
Diffstat (limited to 'projects')
-rw-r--r-- | projects/vstudio/WARNING | 23 | ||||
-rw-r--r-- | projects/vstudio/libpng/libpng.vcxproj | 2 | ||||
-rw-r--r-- | projects/vstudio/pnglibconf/pnglibconf.vcxproj | 1 | ||||
-rw-r--r-- | projects/vstudio/pngtest/pngtest.vcxproj | 2 | ||||
-rw-r--r-- | projects/vstudio/pngvalid/pngvalid.vcxproj | 2 | ||||
-rw-r--r-- | projects/vstudio/readme.txt | 10 | ||||
-rw-r--r-- | projects/vstudio/zlib.props | 10 | ||||
-rw-r--r-- | projects/vstudio/zlib/zlib.vcxproj | 2 |
8 files changed, 46 insertions, 6 deletions
diff --git a/projects/vstudio/WARNING b/projects/vstudio/WARNING new file mode 100644 index 000000000..16968138d --- /dev/null +++ b/projects/vstudio/WARNING @@ -0,0 +1,23 @@ +WARNING +======= +Libpng 1.5 erroneously uses /MD when building debug DLL versions of libpng. +It should use /MDd - you can change this under properties\C/C++\Code +Generation\Runtime Library if you need to use the debug runtime for debug +builds. This will be changed in libpng 1.6 but is currently retained for +compatibility with older libpng 1.5 releases. + +The runtime library settings for each build are as follows: + + Release Debug +DLL /MD /MD +Library /MT /MTd + +The Visual Studio 2010 defaults for a Win32 DLL or Static Library project are +as follows: + + Release Debug +DLL /MD /MDd +Static Library /MD /MDd + +Notice that by default static library builds use the DLL runtime, not the +static library runtime. diff --git a/projects/vstudio/libpng/libpng.vcxproj b/projects/vstudio/libpng/libpng.vcxproj index c4bf04184..f2efa73f7 100644 --- a/projects/vstudio/libpng/libpng.vcxproj +++ b/projects/vstudio/libpng/libpng.vcxproj @@ -23,8 +23,8 @@ <Keyword>Win32Proj</Keyword> <RootNamespace>libpng</RootNamespace> </PropertyGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <Import Project="$(SolutionDir)\zlib.props" /> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> <ConfigurationType>DynamicLibrary</ConfigurationType> <CharacterSet>MultiByte</CharacterSet> diff --git a/projects/vstudio/pnglibconf/pnglibconf.vcxproj b/projects/vstudio/pnglibconf/pnglibconf.vcxproj index 7c691c32d..e2a232cb6 100644 --- a/projects/vstudio/pnglibconf/pnglibconf.vcxproj +++ b/projects/vstudio/pnglibconf/pnglibconf.vcxproj @@ -17,6 +17,7 @@ <WholeProgramOptimization>true</WholeProgramOptimization> <CharacterSet>MultiByte</CharacterSet> </PropertyGroup> + <Import Project="$(SolutionDir)\zlib.props" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <ImportGroup Label="ExtensionSettings"> </ImportGroup> diff --git a/projects/vstudio/pngtest/pngtest.vcxproj b/projects/vstudio/pngtest/pngtest.vcxproj index a03dca565..561370d01 100644 --- a/projects/vstudio/pngtest/pngtest.vcxproj +++ b/projects/vstudio/pngtest/pngtest.vcxproj @@ -23,8 +23,8 @@ <Keyword>Win32Proj</Keyword> <RootNamespace>pngtest</RootNamespace> </PropertyGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <Import Project="$(SolutionDir)\zlib.props" /> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <CharacterSet>Unicode</CharacterSet> diff --git a/projects/vstudio/pngvalid/pngvalid.vcxproj b/projects/vstudio/pngvalid/pngvalid.vcxproj index 6a0a6e4f3..2cd0e7bf6 100644 --- a/projects/vstudio/pngvalid/pngvalid.vcxproj +++ b/projects/vstudio/pngvalid/pngvalid.vcxproj @@ -23,8 +23,8 @@ <Keyword>Win32Proj</Keyword> <RootNamespace>pngvalid</RootNamespace> </PropertyGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <Import Project="$(SolutionDir)\zlib.props" /> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <CharacterSet>Unicode</CharacterSet> diff --git a/projects/vstudio/readme.txt b/projects/vstudio/readme.txt index 940f29e82..3f2b40687 100644 --- a/projects/vstudio/readme.txt +++ b/projects/vstudio/readme.txt @@ -1,7 +1,7 @@ VisualStudio instructions -libpng version 1.5.13 - September 27, 2012 +libpng version 1.5.14 - January 24, 2013 Copyright (c) 1998-2010 Glenn Randers-Pehrson @@ -13,6 +13,14 @@ This directory contains support for building libpng under MicroSoft VisualStudio 2010. It may also work under later versions of VisualStudio. You should be familiar with VisualStudio before using this directory. +WARNING +======= +Libpng 1.5 erroneously uses /MD when building debug DLL versions of libpng. +It should use /MDd - you can change this under properties\C/C++\Code +Generation\Runtime Library if you need to use the debug runtime for debug +builds. This will be changed in libpng 1.6 but is currently retained for +compatibility with older libpng 1.5 releases. + Initial preparations ==================== You must enter some information in zlib.props before attempting to build diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props index c887fe727..a6019c4ef 100644 --- a/projects/vstudio/zlib.props +++ b/projects/vstudio/zlib.props @@ -2,7 +2,7 @@ <!-- * zlib.props - location of zlib source * - * libpng version 1.5.13 - September 27, 2012 + * libpng version 1.5.14 - January 24, 2013 * * Copyright (c) 1998-2011 Glenn Randers-Pehrson * @@ -33,5 +33,13 @@ below: --> <ZLibSrcDir>..\..\..\..\zlib-1.2.5</ZLibSrcDir> + + <!-- The following line allows compilation for an ARM target with Visual + Studio 2012. Notice that this is not supported by the Visual Studio + 2012 IDE and that the programs that result cannot be run unless they + signed by Microsoft. This is therefore untested; only Microsoft can + test it: + --> + <WindowsSDKDesktopARMSupport>true</WindowsSDKDesktopARMSupport> </PropertyGroup> </Project> diff --git a/projects/vstudio/zlib/zlib.vcxproj b/projects/vstudio/zlib/zlib.vcxproj index d62781796..4857ffadd 100644 --- a/projects/vstudio/zlib/zlib.vcxproj +++ b/projects/vstudio/zlib/zlib.vcxproj @@ -34,8 +34,8 @@ <PropertyGroup Label="Globals"> <Keyword>Win32Proj</Keyword> </PropertyGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <Import Project="$(SolutionDir)\zlib.props" /> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Library|Win32'" Label="Configuration"> <ConfigurationType>StaticLibrary</ConfigurationType> </PropertyGroup> |