mewin/libpng
1
0
Fork 0
mirror of https://git.code.sf.net/p/libpng/code.git synced 2025-07-10 18:04:09 +02:00
Code Issues Projects Releases Wiki Activity

[libpng10] Imported from libpng-1.0.50.tar

Browse Source
This commit is contained in:
Glenn Randers-Pehrson
2009-09-10 18:41:08 -05:00
parent e058ce14ea
commit afbb32433c
50 changed files with 287 additions and 184 deletions
Download Patch File Download Diff File Expand all files Collapse all files

133
scripts/CMakeLists.txt
View File

@@ -1,5 +1,5 @@
project(PNG)
project(PNG C)
cmake_minimum_required(VERSION 2.4.3)
# Copyright (C) 2007 Glenn Randers-Pehrson
@@ -9,12 +9,16 @@ project(PNG)
set(PNGLIB_MAJOR 1)
set(PNGLIB_MINOR 0)
set(PNGLIB_RELEASE 48)
set(PNGLIB_RELEASE 50)
set(PNGLIB_NAME libpng${PNGLIB_MAJOR}${PNGLIB_MINOR})
set(PNGLIB_VERSION ${PNGLIB_MAJOR}.${PNGLIB_MINOR}.${PNGLIB_RELEASE})
set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS true)
# needed packages
find_package(ZLIB REQUIRED)
include_directories(${ZLIB_INCLUDE_DIR})
if(NOT WIN32)
find_library(M_LIBRARY
NAMES m
@@ -23,24 +27,33 @@ if(NOT WIN32)
if(NOT M_LIBRARY)
message(STATUS
"math library 'libm' not found - floating point support disabled")
endif(NOT M_LIBRARY)
else(NOT WIN32)
endif()
else()
# not needed on windows
set(M_LIBRARY "")
endif(NOT WIN32)
endif()
# COMMAND LINE OPTIONS
option(PNG_SHARED "Build shared lib" YES)
option(PNG_STATIC "Build static lib" YES)
if(DEFINED PNG_SHARED)
option(PNG_SHARED "Build shared lib" ${PNG_SHARED})
else()
option(PNG_SHARED "Build shared lib" ON)
endif()
if(DEFINED PNG_STATIC)
option(PNG_STATIC "Build static lib" ${PNG_STATIC})
else()
option(PNG_STATIC "Build static lib" ON)
endif()
if(MINGW)
option(PNG_TESTS "Build pngtest" NO)
else(MINGW)
option(PNG_TESTS "Build pngtest" YES)
endif(MINGW)
option(PNG_NO_CONSOLE_IO "FIXME" YES)
option(PNG_NO_STDIO "FIXME" YES)
option(PNG_DEBUG "Build with debug output" YES)
option(PNG_DEBUG "Build with debug output" NO)
option(PNGARG "FIXME" YES)
#TODO:
# PNG_CONSOLE_IO_SUPPORTED
@@ -57,20 +70,16 @@ if(NOT WIN32)
set(png_asm_tmp "OFF")
endif("uname_output" MATCHES "^.*i[1-9]86.*$")
endif(uname_executable)
else(NOT WIN32)
else()
# this env var is normally only set on win64
SET(TEXT "ProgramFiles(x86)")
if("$ENV{${TEXT}}" STREQUAL "")
set(png_asm_tmp "ON")
endif("$ENV{${TEXT}}" STREQUAL "")
endif(NOT WIN32)
endif()
# SET LIBNAME
# msvc does not append 'lib' - do it here to have consistent name
if(MSVC)
set(PNG_LIB_NAME lib)
endif(MSVC)
set(PNG_LIB_NAME ${PNG_LIB_NAME}png${PNGLIB_MAJOR}${PNGLIB_MINOR})
set(PNG_LIB_NAME png${PNGLIB_MAJOR}${PNGLIB_MINOR})
# to distinguish between debug and release lib
set(CMAKE_DEBUG_POSTFIX "d")
@@ -104,54 +113,67 @@ if(MSVC)
add_definitions(-DPNG_NO_MODULEDEF -D_CRT_SECURE_NO_DEPRECATE)
endif(MSVC)
add_definitions(-DZLIB_DLL)
if(PNG_SHARED OR NOT MSVC)
#if building msvc static this has NOT do be defined
add_definitions(-DZLIB_DLL)
endif()
add_definitions(-DLIBPNG_NO_MMX)
add_definitions(-DPNG_NO_MMX_CODE)
if(PNG_CONSOLE_IO_SUPPORTED)
add_definitions(-DPNG_CONSOLE_IO_SUPPORTED)
endif(PNG_CONSOLE_IO_SUPPORTED)
endif()
if(PNG_NO_CONSOLE_IO)
add_definitions(-DPNG_NO_CONSOLE_IO)
endif(PNG_NO_CONSOLE_IO)
endif()
if(PNG_NO_STDIO)
add_definitions(-DPNG_NO_STDIO)
endif(PNG_NO_STDIO)
endif()
if(PNG_DEBUG)
add_definitions(-DPNG_DEBUG)
endif(PNG_DEBUG)
endif()
if(NOT M_LIBRARY AND NOT WIN32)
add_definitions(-DPNG_NO_FLOATING_POINT_SUPPORTED)
endif(NOT M_LIBRARY AND NOT WIN32)
endif()
# NOW BUILD OUR TARGET
include_directories(${PNG_SOURCE_DIR} ${ZLIB_INCLUDE_DIR})
if(PNG_SHARED)
add_library(${PNG_LIB_NAME} SHARED ${libpng_sources})
if(MSVC)
# msvc does not append 'lib' - do it here to have consistent name
set_target_properties(${PNG_LIB_NAME} PROPERTIES PREFIX "lib")
endif()
target_link_libraries(${PNG_LIB_NAME} ${ZLIB_LIBRARY} ${M_LIBRARY})
endif(PNG_SHARED)
endif()
if(PNG_STATIC)
# does not work without changing name
set(PNG_LIB_NAME_STATIC ${PNG_LIB_NAME}_static)
add_library(${PNG_LIB_NAME_STATIC} STATIC ${libpng_sources})
endif(PNG_STATIC)
if(MSVC)
# msvc does not append 'lib' - do it here to have consistent name
set_target_properties(${PNG_LIB_NAME_STATIC} PROPERTIES PREFIX "lib")
endif()
endif()
if(PNG_SHARED AND WIN32)
set_target_properties(${PNG_LIB_NAME} PROPERTIES DEFINE_SYMBOL PNG_BUILD_DLL)
endif(PNG_SHARED AND WIN32)
endif()
if(PNG_TESTS)
if(PNG_TESTS AND PNG_SHARED)
# does not work with msvc due to png_lib_ver issue
add_executable(pngtest ${pngtest_sources})
target_link_libraries(pngtest ${PNG_LIB_NAME})
# add_test(pngtest ${PNG_SOURCE_DIR}/pngtest.png)
endif(PNG_TESTS)
endif()
# CREATE PKGCONFIG FILES
@@ -171,30 +193,49 @@ configure_file(${PNG_SOURCE_DIR}/scripts/libpng-config.in
${PNG_BINARY_DIR}/${PNGLIB_NAME}-config)
# SET UP LINKS
set_target_properties(${PNG_LIB_NAME} PROPERTIES
# VERSION 0.${PNGLIB_RELEASE}.1.0.48
if(PNG_SHARED)
set_target_properties(${PNG_LIB_NAME} PROPERTIES
# VERSION 0.${PNGLIB_RELEASE}.1.0.50
VERSION 0.${PNGLIB_RELEASE}.0
SOVERSION 0
CLEAN_DIRECT_OUTPUT 1)
if(NOT WIN32)
# that's uncool on win32 - it overwrites our static import lib...
set_target_properties(${PNG_LIB_NAME_STATIC} PROPERTIES
OUTPUT_NAME ${PNG_LIB_NAME}
CLEAN_DIRECT_OUTPUT 1)
endif(NOT WIN32)
# INSTALL
install_targets(/lib ${PNG_LIB_NAME})
endif()
if(PNG_STATIC)
install_targets(/lib ${PNG_LIB_NAME_STATIC})
endif(PNG_STATIC)
if(NOT WIN32)
# that's uncool on win32 - it overwrites our static import lib...
set_target_properties(${PNG_LIB_NAME_STATIC} PROPERTIES
OUTPUT_NAME ${PNG_LIB_NAME}
CLEAN_DIRECT_OUTPUT 1)
endif()
endif()
# INSTALL
if(NOT SKIP_INSTALL_LIBRARIES AND NOT SKIP_INSTALL_ALL )
if(PNG_SHARED)
install(TARGETS ${PNG_LIB_NAME}
RUNTIME DESTINATION bin
LIBRARY DESTINATION lib
ARCHIVE DESTINATION lib)
endif()
if(PNG_STATIC)
install(TARGETS ${PNG_LIB_NAME_STATIC}
LIBRARY DESTINATION lib
ARCHIVE DESTINATION lib)
endif()
endif()
if(NOT SKIP_INSTALL_HEADERS AND NOT SKIP_INSTALL_ALL )
install(FILES png.h pngconf.h DESTINATION include)
install(FILES png.h pngconf.h DESTINATION include/${PNGLIB_NAME})
install(FILES libpng.3 libpngpf.3 DESTINATION man/man3)
install(FILES png.5 DESTINATION man/man5)
install(FILES ${PNG_BINARY_DIR}/libpng.pc DESTINATION lib/pkgconfig)
install(FILES ${PNG_BINARY_DIR}/libpng-config DESTINATION bin)
install(FILES ${PNG_BINARY_DIR}/${PNGLIB_NAME}.pc DESTINATION lib/pkgconfig)
install(FILES ${PNG_BINARY_DIR}/${PNGLIB_NAME}-config DESTINATION bin)
endif()
if(NOT SKIP_INSTALL_FILES AND NOT SKIP_INSTALL_ALL )
install(FILES libpng.3 libpngpf.3 DESTINATION man/man3)
install(FILES png.5 DESTINATION man/man5)
install(FILES ${PNG_BINARY_DIR}/libpng.pc DESTINATION lib/pkgconfig)
install(FILES ${PNG_BINARY_DIR}/libpng-config DESTINATION bin)
install(FILES ${PNG_BINARY_DIR}/${PNGLIB_NAME}.pc DESTINATION lib/pkgconfig)
install(FILES ${PNG_BINARY_DIR}/${PNGLIB_NAME}-config DESTINATION bin)
endif()
# what's with libpng.txt and all the extra files?

2
scripts/libpng-config-head.in
View File

@@ -11,7 +11,7 @@
# Modeled after libxml-config.
version=1.0.48
version=1.0.50
prefix=""
libdir=""
libs=""

2
scripts/libpng.pc.in
View File

@@ -5,6 +5,6 @@ includedir=@includedir@/libpng10
Name: libpng
Description: Loads and saves PNG files
Version: 1.0.48
Version: 1.0.50
Libs: -L${libdir} -lpng10
Cflags: -I${includedir}

2
scripts/makefile.32sunu
View File

@@ -11,7 +11,7 @@
# Library name:
LIBNAME=libpng10
PNGMAJ = 0
PNGMIN = 1.0.48
PNGMIN = 1.0.50
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:

2
scripts/makefile.64sunu
View File

@@ -11,7 +11,7 @@
# Library name:
LIBNAME=libpng10
PNGMAJ = 0
PNGMIN = 1.0.48
PNGMIN = 1.0.50
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:

2
scripts/makefile.aix
View File

@@ -23,7 +23,7 @@ LN_SF = ln -f -s
LIBNAME=libpng10
PNGMAJ = 0
PNGMIN = 1.0.48
PNGMIN = 1.0.50
PNGVER = $(PNGMAJ).$(PNGMIN)
prefix=/usr/local

2
scripts/makefile.beos
View File

@@ -11,7 +11,7 @@
# Library name:
LIBNAME=libpng10
PNGMAJ = 0
PNGMIN = 1.0.48
PNGMIN = 1.0.50
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:

2
scripts/makefile.cygwin
View File

@@ -77,7 +77,7 @@ CFLAGS= $(strip $(MINGW_CCFLAGS) $(addprefix -I,$(ZLIBINC)) \
LIBNAME = libpng10
PNGMAJ = 0
CYGDLL = 10
PNGMIN = 1.0.48
PNGMIN = 1.0.50
PNGVER = $(PNGMAJ).$(PNGMIN)
SHAREDLIB=cygpng$(CYGDLL).dll

2
scripts/makefile.darwin
View File

@@ -22,7 +22,7 @@ ZLIBINC=../zlib
# Library name:
LIBNAME = libpng10
PNGMAJ = 10
PNGMIN = 1.0.48
PNGMIN = 1.0.50
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:

2
scripts/makefile.dec
View File

@@ -8,7 +8,7 @@
# Library name:
PNGMAJ = 0
PNGMIN = 1.0.48
PNGMIN = 1.0.50
PNGVER = $(PNGMAJ).$(PNGMIN)
LIBNAME = libpng10

2
scripts/makefile.elf
View File

@@ -16,7 +16,7 @@
# Library name:
LIBNAME = libpng10
PNGMAJ = 0
PNGMIN = 1.0.48
PNGMIN = 1.0.50
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:

2
scripts/makefile.gcmmx
View File

@@ -17,7 +17,7 @@
# Library name:
LIBNAME = libpng10
PNGMAJ = 0
PNGMIN = 1.0.48
PNGMIN = 1.0.50
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:

2
scripts/makefile.hp64
View File

@@ -21,7 +21,7 @@ ZLIBINC=/opt/zlib/include
# Library name:
LIBNAME = libpng10
PNGMAJ = 0
PNGMIN = 1.0.48
PNGMIN = 1.0.50
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:

2
scripts/makefile.hpgcc
View File

@@ -11,7 +11,7 @@
# Library name:
LIBNAME = libpng10
PNGMAJ = 0
PNGMIN = 1.0.48
PNGMIN = 1.0.50
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:

2
scripts/makefile.hpux
View File

@@ -21,7 +21,7 @@ ZLIBINC=/opt/zlib/include
# Library name:
LIBNAME = libpng10
PNGMAJ = 0
PNGMIN = 1.0.48
PNGMIN = 1.0.50
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:

2
scripts/makefile.linux
View File

@@ -10,7 +10,7 @@
# Library name:
LIBNAME = libpng10
PNGMAJ = 0
PNGMIN = 1.0.48
PNGMIN = 1.0.50
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:

2
scripts/makefile.mingw
View File

@@ -77,7 +77,7 @@ CFLAGS= $(strip $(MINGW_CCFLAGS) $(addprefix -I,$(ZLIBINC)) \
LIBNAME = libpng10
PNGMAJ = 0
MINGDLL = 10
PNGMIN = 1.0.48
PNGMIN = 1.0.50
PNGVER = $(PNGMAJ).$(PNGMIN)
SHAREDLIB=libpng$(MINGDLL).dll

2
scripts/makefile.ne12bsd
View File

@@ -17,7 +17,7 @@ INCSDIR=${LOCALBASE}/include/libpng10
LIB= png10
SHLIB_MAJOR= 0
SHLIB_MINOR= 1.0.48
SHLIB_MINOR= 1.0.50
SRCS= png.c pngset.c pngget.c pngrutil.c pngtrans.c pngwutil.c \
pngread.c pngrio.c pngwio.c pngwrite.c pngrtran.c \
pngwtran.c pngmem.c pngerror.c pngpread.c

2
scripts/makefile.netbsd
View File

@@ -17,7 +17,7 @@ INCSDIR=${LOCALBASE}/include/libpng
LIB= png
SHLIB_MAJOR= 3
SHLIB_MINOR= 1.0.48
SHLIB_MINOR= 1.0.50
SRCS= png.c pngset.c pngget.c pngrutil.c pngtrans.c pngwutil.c \
pngread.c pngrio.c pngwio.c pngwrite.c pngrtran.c \
pngwtran.c pngmem.c pngerror.c pngpread.c

2
scripts/makefile.nommx
View File

@@ -10,7 +10,7 @@
# Library name:
LIBNAME = libpng10
PNGMAJ = 0
PNGMIN = 1.0.48
PNGMIN = 1.0.50
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:

2
scripts/makefile.openbsd
View File

@@ -11,7 +11,7 @@ LIBDIR= ${PREFIX}/lib
MANDIR= ${PREFIX}/man/cat
SHLIB_MAJOR= 0
SHLIB_MINOR= 1.0.48
SHLIB_MINOR= 1.0.50
LIB= png
SRCS= png.c pngerror.c pngget.c pngmem.c pngpread.c \

2
scripts/makefile.sco
View File

@@ -12,7 +12,7 @@
# Library name:
LIBNAME = libpng10
PNGMAJ = 0
PNGMIN = 1.0.48
PNGMIN = 1.0.50
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:

2
scripts/makefile.sggcc
View File

@@ -9,7 +9,7 @@
# Library name:
LIBNAME=libpng10
PNGMAJ = 0
PNGMIN = 1.0.48
PNGMIN = 1.0.50
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:

2
scripts/makefile.sgi
View File

@@ -9,7 +9,7 @@
# Library name:
LIBNAME=libpng10
PNGMAJ = 0
PNGMIN = 1.0.48
PNGMIN = 1.0.50
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:

2
scripts/makefile.so9
View File

@@ -11,7 +11,7 @@
# Library name:
PNGMAJ = 0
PNGMIN = 1.0.48
PNGMIN = 1.0.50
PNGVER = $(PNGMAJ).$(PNGMIN)
LIBNAME = libpng10

2
scripts/makefile.solaris
View File

@@ -11,7 +11,7 @@
# Library name:
LIBNAME = libpng10
PNGMAJ = 0
PNGMIN = 1.0.48
PNGMIN = 1.0.50
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:

2
scripts/makefile.solaris-x86
View File

@@ -11,7 +11,7 @@
# Library name:
LIBNAME = libpng10
PNGMAJ = 0
PNGMIN = 1.0.48
PNGMIN = 1.0.50
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:

2
scripts/pngos2.def
View File

@@ -2,7 +2,7 @@
; PNG.LIB module definition file for OS/2
;----------------------------------------
; Version 1.0.48
; Version 1.0.50
LIBRARY PNG
DESCRIPTION "PNG image compression library for OS/2"

2
scripts/pngw32.def
View File

@@ -5,7 +5,7 @@
LIBRARY
EXPORTS
;Version 1.0.48
;Version 1.0.50
png_build_grayscale_palette @1
png_check_sig @2
png_chunk_error @3