summaryrefslogtreecommitdiffstats
path: root/src/3rdparty/libpng/projects/visualc71
diff options
context:
space:
mode:
authoraavit <qt-info@nokia.com>2010-02-15 12:08:49 (GMT)
committeraavit <qt-info@nokia.com>2010-02-15 12:14:04 (GMT)
commite9aac1679a651107735414a56ff04621d3287526 (patch)
treefa5905e80a82847fc0dbb044ae51a62ae2cf5deb /src/3rdparty/libpng/projects/visualc71
parentc9a13228d61de352edfb0019121bc83160d3b79f (diff)
downloadQt-e9aac1679a651107735414a56ff04621d3287526.zip
Qt-e9aac1679a651107735414a56ff04621d3287526.tar.gz
Qt-e9aac1679a651107735414a56ff04621d3287526.tar.bz2
Add libpng 1.4.0
This is a clean copy of libpng 1.2.40, except that the contribs directory has been removed, as usual. Our build modifications will follow in a separate commit.
Diffstat (limited to 'src/3rdparty/libpng/projects/visualc71')
-rw-r--r--src/3rdparty/libpng/projects/visualc71/PRJ0041.mak21
-rw-r--r--src/3rdparty/libpng/projects/visualc71/README.txt55
-rw-r--r--src/3rdparty/libpng/projects/visualc71/README_zlib.txt42
3 files changed, 118 insertions, 0 deletions
diff --git a/src/3rdparty/libpng/projects/visualc71/PRJ0041.mak b/src/3rdparty/libpng/projects/visualc71/PRJ0041.mak
new file mode 100644
index 0000000..e15e12b
--- /dev/null
+++ b/src/3rdparty/libpng/projects/visualc71/PRJ0041.mak
@@ -0,0 +1,21 @@
+# Prevent "Cannot find missing dependency..." warnings while compiling
+# pngwin.rc (PRJ0041).
+
+all: $(IntDir)\alloc.h \
+ $(IntDir)\fp.h \
+ $(IntDir)\m68881.h \
+ $(IntDir)\mem.h \
+ $(IntDir)\pngusr.h \
+ $(IntDir)\strings.h \
+ $(IntDir)\unistd.h \
+ $(IntDir)\unixio.h
+
+$(IntDir)\alloc.h \
+$(IntDir)\fp.h \
+$(IntDir)\m68881.h \
+$(IntDir)\mem.h \
+$(IntDir)\pngusr.h \
+$(IntDir)\strings.h \
+$(IntDir)\unistd.h \
+$(IntDir)\unixio.h:
+ @!echo.>$@
diff --git a/src/3rdparty/libpng/projects/visualc71/README.txt b/src/3rdparty/libpng/projects/visualc71/README.txt
new file mode 100644
index 0000000..7d51eed
--- /dev/null
+++ b/src/3rdparty/libpng/projects/visualc71/README.txt
@@ -0,0 +1,55 @@
+Microsoft Developer Studio Project File, Format Version 7.10 for libpng.
+
+Copyright (C) 2004 Simon-Pierre Cadieux.
+
+This code is released under the libpng license.
+For conditions of distribution and use, see copyright notice in png.h
+
+Assumptions:
+* The libpng source files are in ..\..
+* The zlib source files are in ..\..\..\zlib
+* The zlib project file is in . /* Warning: This is until the zlib project
+ files get intergrated into the next zlib release. The final zlib project
+ directory will then be ..\..\..\zlib\projects\visualc71. */
+
+To use:
+
+1) On the main menu, select "File | Open Solution".
+ Open "libpng.sln".
+
+2) Display the Solution Explorer view (Ctrl+Alt+L)
+
+3) Set one of the project as the StartUp project. If you just want to build the
+ binaries set "libpng" as the startup project (Select "libpng" tree view
+ item + Project | Set as StartUp project). If you want to build and test the
+ binaries set it to "pngtest" (Select "pngtest" tree view item +
+ Project | Set as StartUp project)
+
+4) Select "Build | Configuration Manager...".
+ Choose the configuration you wish to build.
+
+5) Select "Build | Clean Solution".
+
+6) Select "Build | Build Solution (Ctrl-Shift-B)"
+
+This project builds the libpng binaries as follows:
+
+* Win32_DLL_Release\libpng14.dll DLL build
+* Win32_DLL_Debug\libpng14d.dll DLL build (debug version)
+* Win32_DLL_VB\libpng14vb.dll DLL build for Visual Basic, using stdcall
+* Win32_LIB_Release\libpng.lib static build
+* Win32_LIB_Debug\libpngd.lib static build (debug version)
+
+Notes:
+
+If you change anything in the source files, or select different compiler
+settings, please change the DLL name to something different than any of
+the above names. Also, make sure that in your "pngusr.h" you define
+PNG_USER_PRIVATEBUILD and PNG_USER_DLLFNAME_POSTFIX according to the
+instructions provided in "pngconf.h".
+
+All DLLs built by this project use the Microsoft dynamic C runtime library
+MSVCR71.DLL (MSVCR71D.DLL for debug versions). If you distribute any of the
+above mentioned libraries you may have to include this DLL in your package.
+For a list of files that are redistributable in Visual Studio see
+$(VCINSTALLDIR)\redist.txt.
diff --git a/src/3rdparty/libpng/projects/visualc71/README_zlib.txt b/src/3rdparty/libpng/projects/visualc71/README_zlib.txt
new file mode 100644
index 0000000..cc73899
--- /dev/null
+++ b/src/3rdparty/libpng/projects/visualc71/README_zlib.txt
@@ -0,0 +1,42 @@
+/* WARNING: This file was put in the LibPNG distribution for convenience only.
+ It is expected to be part of the next zlib release under
+ "projects\visualc71\README.txt." */
+
+Microsoft Developer Studio Project File, Format Version 7.10 for zlib.
+
+Copyright (C) 2004 Simon-Pierre Cadieux.
+Copyright (C) 2004 Cosmin Truta.
+
+This code is released under the libpng license.
+For conditions of distribution and use, see copyright notice in zlib.h.
+
+
+To use:
+
+1) On the main menu, select "File | Open Solution".
+ Open "zlib.sln".
+
+2) Display the Solution Explorer view (Ctrl+Alt+L)
+
+3) Set one of the project as the StartUp project. If you just want to build the
+ binaries set "zlib" as the startup project (Select "zlib" tree view item +
+ Project | Set as StartUp project). If you want to build and test the
+ binaries set it to "example" (Select "example" tree view item + Project |
+ Set as StartUp project), If you want to build the minigzip utility set it to
+ "minigzip" (Select "minigzip" tree view item + Project | Set as StartUp
+ project
+
+4) Select "Build | Configuration Manager...".
+ Choose the configuration you wish to build.
+
+5) Select "Build | Clean Solution".
+
+6) Select "Build | Build Solution (Ctrl-Shift-B)"
+
+This project builds the zlib binaries as follows:
+
+* Win32_DLL_Release\zlib1.dll DLL build
+* Win32_DLL_Debug\zlib1d.dll DLL build (debug version)
+* Win32_LIB_Release\zlib.lib static build
+* Win32_LIB_Debug\zlibd.lib static build (debug version)
+