rsvglibs: libpng for Mac and Windows
This commit is contained in:
ka
parent
0d9ba0a484
commit
bc9b606106
3 changed files with 254 additions and 34 deletions
|
|
@ -1,5 +1,5 @@
|
|||
--- misc/libpng/makefile.mk 2011-03-01 00:01:58.221734678 +0100
|
||||
+++ misc/build/libpng/makefile.mk 2011-02-28 23:52:40.953319424 +0100
|
||||
--- misc/libpng-1.5.1/makefile.mk 2011-03-01 00:01:58.221734678 +0100
|
||||
+++ misc/build/libpng-1.5.1/makefile.mk 2011-02-28 23:52:40.953319424 +0100
|
||||
@@ -1 +1,49 @@
|
||||
-dummy
|
||||
+#*************************************************************************
|
||||
|
|
@ -27,23 +27,23 @@
|
|||
+
|
||||
+# --- Files --------------------------------------------------------
|
||||
+
|
||||
+SLOFILES= $(SLO)$/png.c \
|
||||
+ $(SLO)$/pngerror.c \
|
||||
+ $(SLO)$/pngget.c \
|
||||
+ $(SLO)$/pngmem.c \
|
||||
+ $(SLO)$/pngpread.c \
|
||||
+ $(SLO)$/pngread.c \
|
||||
+ $(SLO)$/pngrio.c \
|
||||
+ $(SLO)$/pngrtran.c \
|
||||
+ $(SLO)$/pngrutil.c \
|
||||
+ $(SLO)$/pngset.c \
|
||||
+ $(SLO)$/pngtest.c \
|
||||
+ $(SLO)$/pngtrans.c \
|
||||
+ $(SLO)$/pngvalid.c \
|
||||
+ $(SLO)$/pngwio.c \
|
||||
+ $(SLO)$/pngwrite.c \
|
||||
+ $(SLO)$/pngwtran.c \
|
||||
+ $(SLO)$/pngwutil.c
|
||||
+SLOFILES= $(SLO)$/png.obj \
|
||||
+ $(SLO)$/pngerror.obj \
|
||||
+ $(SLO)$/pngget.obj \
|
||||
+ $(SLO)$/pngmem.obj \
|
||||
+ $(SLO)$/pngpread.obj \
|
||||
+ $(SLO)$/pngread.obj \
|
||||
+ $(SLO)$/pngrio.obj \
|
||||
+ $(SLO)$/pngrtran.obj \
|
||||
+ $(SLO)$/pngrutil.obj \
|
||||
+ $(SLO)$/pngset.obj \
|
||||
+ $(SLO)$/pngtest.obj \
|
||||
+ $(SLO)$/pngtrans.obj \
|
||||
+ $(SLO)$/pngvalid.obj \
|
||||
+ $(SLO)$/pngwio.obj \
|
||||
+ $(SLO)$/pngwrite.obj \
|
||||
+ $(SLO)$/pngwtran.obj \
|
||||
+ $(SLO)$/pngwutil.obj
|
||||
+
|
||||
+LIB1TARGET=$(SLB)$/$(TARGET).lib
|
||||
+LIB1ARCHIV=$(LB)$/lib$(TARGET).a
|
||||
|
|
@ -51,3 +51,228 @@
|
|||
+
|
||||
+.INCLUDE : target.mk
|
||||
+
|
||||
--- misc/libpng-1.5.1/pnglibconf.h 2011-03-02 15:19:29.537422800 +0100
|
||||
+++ misc/build/libpng-1.5.1/pnglibconf.h 2011-03-02 15:18:11.492358700 +0100
|
||||
@@ -1 +1,176 @@
|
||||
-dummy
|
||||
+
|
||||
+/* libpng STANDARD API DEFINITION */
|
||||
+
|
||||
+/* pnglibconf.h - library build configuration */
|
||||
+
|
||||
+/* libpng version 1.5.0 - last changed on January 6, 2011 */
|
||||
+
|
||||
+/* Copyright (c) 1998-2011 Glenn Randers-Pehrson */
|
||||
+
|
||||
+/* This code is released under the libpng license. */
|
||||
+/* For conditions of distribution and use, see the disclaimer */
|
||||
+/* and license in png.h */
|
||||
+
|
||||
+/* pnglibconf.h */
|
||||
+/* Machine generated file: DO NOT EDIT */
|
||||
+/* Derived from: scripts/pnglibconf.dfa */
|
||||
+#ifndef PNGLCONF_H
|
||||
+#define PNGLCONF_H
|
||||
+/* settings */
|
||||
+#define PNG_MAX_GAMMA_8 11
|
||||
+#define PNG_CALLOC_SUPPORTED
|
||||
+#define PNG_QUANTIZE_RED_BITS 5
|
||||
+#define PNG_USER_WIDTH_MAX 1000000L
|
||||
+#define PNG_QUANTIZE_GREEN_BITS 5
|
||||
+#define PNG_API_RULE 0
|
||||
+#define PNG_QUANTIZE_BLUE_BITS 5
|
||||
+#define PNG_USER_CHUNK_CACHE_MAX 0
|
||||
+#define PNG_USER_HEIGHT_MAX 1000000L
|
||||
+#define PNG_sCAL_PRECISION 5
|
||||
+#define PNG_COST_SHIFT 3
|
||||
+#define PNG_WEIGHT_SHIFT 8
|
||||
+#define PNG_USER_CHUNK_MALLOC_MAX 0
|
||||
+#define PNG_DEFAULT_READ_MACROS 1
|
||||
+#define PNG_ZBUF_SIZE 8192
|
||||
+#define PNG_GAMMA_THRESHOLD_FIXED 5000
|
||||
+/* end of settings */
|
||||
+/* options */
|
||||
+#define PNG_INFO_IMAGE_SUPPORTED
|
||||
+#define PNG_HANDLE_AS_UNKNOWN_SUPPORTED
|
||||
+#define PNG_POINTER_INDEXING_SUPPORTED
|
||||
+#define PNG_WARNINGS_SUPPORTED
|
||||
+#define PNG_FLOATING_ARITHMETIC_SUPPORTED
|
||||
+#define PNG_WRITE_SUPPORTED
|
||||
+#define PNG_WRITE_INTERLACING_SUPPORTED
|
||||
+#define PNG_WRITE_16BIT_SUPPORTED
|
||||
+#define PNG_EASY_ACCESS_SUPPORTED
|
||||
+#define PNG_ALIGN_MEMORY_SUPPORTED
|
||||
+#define PNG_WRITE_WEIGHTED_FILTER_SUPPORTED
|
||||
+#define PNG_WRITE_UNKNOWN_CHUNKS_SUPPORTED
|
||||
+#define PNG_USER_LIMITS_SUPPORTED
|
||||
+#define PNG_FIXED_POINT_SUPPORTED
|
||||
+/*#undef PNG_ERROR_NUMBERS_SUPPORTED*/
|
||||
+#define PNG_ERROR_TEXT_SUPPORTED
|
||||
+#define PNG_READ_SUPPORTED
|
||||
+/*#undef PNG_READ_16_TO_8_ACCURATE_SCALE_SUPPORTED*/
|
||||
+#define PNG_BENIGN_ERRORS_SUPPORTED
|
||||
+#define PNG_SETJMP_SUPPORTED
|
||||
+#define PNG_WRITE_FLUSH_SUPPORTED
|
||||
+#define PNG_MNG_FEATURES_SUPPORTED
|
||||
+#define PNG_FLOATING_POINT_SUPPORTED
|
||||
+#define PNG_INCH_CONVERSIONS_SUPPORTED
|
||||
+#define PNG_STDIO_SUPPORTED
|
||||
+#define PNG_READ_UNKNOWN_CHUNKS_SUPPORTED
|
||||
+#define PNG_USER_MEM_SUPPORTED
|
||||
+#define PNG_IO_STATE_SUPPORTED
|
||||
+#define PNG_SET_USER_LIMITS_SUPPORTED
|
||||
+#define PNG_READ_ANCILLARY_CHUNKS_SUPPORTED
|
||||
+#define PNG_WRITE_INT_FUNCTIONS_SUPPORTED
|
||||
+#define PNG_WRITE_ANCILLARY_CHUNKS_SUPPORTED
|
||||
+#define PNG_WRITE_FILTER_SUPPORTED
|
||||
+#define PNG_SET_CHUNK_CACHE_LIMIT_SUPPORTED
|
||||
+#define PNG_WRITE_iCCP_SUPPORTED
|
||||
+#define PNG_READ_TRANSFORMS_SUPPORTED
|
||||
+#define PNG_READ_GAMMA_SUPPORTED
|
||||
+#define PNG_READ_bKGD_SUPPORTED
|
||||
+#define PNG_UNKNOWN_CHUNKS_SUPPORTED
|
||||
+#define PNG_READ_sCAL_SUPPORTED
|
||||
+#define PNG_WRITE_hIST_SUPPORTED
|
||||
+#define PNG_READ_OPT_PLTE_SUPPORTED
|
||||
+#define PNG_SET_CHUNK_MALLOC_LIMIT_SUPPORTED
|
||||
+#define PNG_WRITE_gAMA_SUPPORTED
|
||||
+#define PNG_READ_GRAY_TO_RGB_SUPPORTED
|
||||
+#define PNG_WRITE_pCAL_SUPPORTED
|
||||
+#define PNG_READ_INVERT_ALPHA_SUPPORTED
|
||||
+#define PNG_WRITE_TRANSFORMS_SUPPORTED
|
||||
+#define PNG_READ_sBIT_SUPPORTED
|
||||
+#define PNG_READ_PACK_SUPPORTED
|
||||
+#define PNG_WRITE_SWAP_SUPPORTED
|
||||
+#define PNG_READ_cHRM_SUPPORTED
|
||||
+#define PNG_WRITE_tIME_SUPPORTED
|
||||
+#define PNG_READ_INTERLACING_SUPPORTED
|
||||
+#define PNG_READ_tRNS_SUPPORTED
|
||||
+#define PNG_WRITE_pHYs_SUPPORTED
|
||||
+#define PNG_WRITE_INVERT_SUPPORTED
|
||||
+#define PNG_READ_RGB_TO_GRAY_SUPPORTED
|
||||
+#define PNG_WRITE_sRGB_SUPPORTED
|
||||
+#define PNG_READ_oFFs_SUPPORTED
|
||||
+#define PNG_WRITE_FILLER_SUPPORTED
|
||||
+#define PNG_WRITE_TEXT_SUPPORTED
|
||||
+#define PNG_WRITE_SHIFT_SUPPORTED
|
||||
+#define PNG_PROGRESSIVE_READ_SUPPORTED
|
||||
+#define PNG_READ_SHIFT_SUPPORTED
|
||||
+#define PNG_CONVERT_tIME_SUPPORTED
|
||||
+#define PNG_READ_USER_TRANSFORM_SUPPORTED
|
||||
+#define PNG_READ_INT_FUNCTIONS_SUPPORTED
|
||||
+#define PNG_READ_USER_CHUNKS_SUPPORTED
|
||||
+#define PNG_READ_hIST_SUPPORTED
|
||||
+#define PNG_READ_16BIT_SUPPORTED
|
||||
+#define PNG_READ_SWAP_ALPHA_SUPPORTED
|
||||
+#define PNG_READ_COMPOSITE_NODIV_SUPPORTED
|
||||
+#define PNG_SEQUENTIAL_READ_SUPPORTED
|
||||
+#define PNG_READ_BACKGROUND_SUPPORTED
|
||||
+#define PNG_READ_QUANTIZE_SUPPORTED
|
||||
+#define PNG_READ_iCCP_SUPPORTED
|
||||
+#define PNG_READ_STRIP_ALPHA_SUPPORTED
|
||||
+#define PNG_READ_PACKSWAP_SUPPORTED
|
||||
+#define PNG_READ_sRGB_SUPPORTED
|
||||
+#define PNG_WRITE_tEXt_SUPPORTED
|
||||
+#define PNG_READ_gAMA_SUPPORTED
|
||||
+#define PNG_READ_pCAL_SUPPORTED
|
||||
+#define PNG_READ_EXPAND_SUPPORTED
|
||||
+#define PNG_WRITE_sPLT_SUPPORTED
|
||||
+#define PNG_READ_SWAP_SUPPORTED
|
||||
+#define PNG_READ_tIME_SUPPORTED
|
||||
+#define PNG_READ_pHYs_SUPPORTED
|
||||
+#define PNG_WRITE_SWAP_ALPHA_SUPPORTED
|
||||
+#define PNG_TIME_RFC1123_SUPPORTED
|
||||
+#define PNG_READ_TEXT_SUPPORTED
|
||||
+#define PNG_WRITE_BGR_SUPPORTED
|
||||
+#define PNG_USER_CHUNKS_SUPPORTED
|
||||
+#define PNG_CONSOLE_IO_SUPPORTED
|
||||
+#define PNG_WRITE_PACK_SUPPORTED
|
||||
+#define PNG_READ_FILLER_SUPPORTED
|
||||
+#define PNG_WRITE_bKGD_SUPPORTED
|
||||
+#define PNG_WRITE_tRNS_SUPPORTED
|
||||
+#define PNG_READ_sPLT_SUPPORTED
|
||||
+#define PNG_WRITE_sCAL_SUPPORTED
|
||||
+#define PNG_WRITE_oFFs_SUPPORTED
|
||||
+#define PNG_READ_tEXt_SUPPORTED
|
||||
+#define PNG_WRITE_sBIT_SUPPORTED
|
||||
+#define PNG_READ_INVERT_SUPPORTED
|
||||
+#define PNG_READ_16_TO_8_SUPPORTED
|
||||
+#define PNG_WRITE_cHRM_SUPPORTED
|
||||
+#define PNG_16BIT_SUPPORTED
|
||||
+#define PNG_WRITE_USER_TRANSFORM_SUPPORTED
|
||||
+#define PNG_READ_BGR_SUPPORTED
|
||||
+#define PNG_WRITE_PACKSWAP_SUPPORTED
|
||||
+#define PNG_WRITE_INVERT_ALPHA_SUPPORTED
|
||||
+#define PNG_sCAL_SUPPORTED
|
||||
+#define PNG_WRITE_zTXt_SUPPORTED
|
||||
+#define PNG_sBIT_SUPPORTED
|
||||
+#define PNG_cHRM_SUPPORTED
|
||||
+#define PNG_bKGD_SUPPORTED
|
||||
+#define PNG_tRNS_SUPPORTED
|
||||
+#define PNG_WRITE_iTXt_SUPPORTED
|
||||
+#define PNG_oFFs_SUPPORTED
|
||||
+#define PNG_USER_TRANSFORM_PTR_SUPPORTED
|
||||
+#define PNG_USER_TRANSFORM_INFO_SUPPORTED
|
||||
+#define PNG_hIST_SUPPORTED
|
||||
+#define PNG_iCCP_SUPPORTED
|
||||
+#define PNG_sRGB_SUPPORTED
|
||||
+#define PNG_READ_zTXt_SUPPORTED
|
||||
+#define PNG_gAMA_SUPPORTED
|
||||
+#define PNG_pCAL_SUPPORTED
|
||||
+#define PNG_CHECK_cHRM_SUPPORTED
|
||||
+#define PNG_tIME_SUPPORTED
|
||||
+#define PNG_pHYs_SUPPORTED
|
||||
+#define PNG_READ_iTXt_SUPPORTED
|
||||
+#define PNG_TEXT_SUPPORTED
|
||||
+#define PNG_SAVE_INT_32_SUPPORTED
|
||||
+#define PNG_sPLT_SUPPORTED
|
||||
+#define PNG_tEXt_SUPPORTED
|
||||
+#define PNG_zTXt_SUPPORTED
|
||||
+#define PNG_iTXt_SUPPORTED
|
||||
+/* end of options */
|
||||
+#endif /* PNGLCONF_H */
|
||||
--- misc/libpng-1.5.1/pngstruct.h 2011-02-03 05:58:17.000000000 +0100
|
||||
+++ misc/build/libpng-1.5.1/pngstruct.h 2011-03-02 16:28:53.289801400 +0100
|
||||
@@ -24,7 +24,11 @@
|
||||
* in this structure and is required for decompressing the LZ compressed
|
||||
* data in PNG files.
|
||||
*/
|
||||
+#if defined MACOSX
|
||||
#include "zlib.h"
|
||||
+#else
|
||||
+#include <external/zlib/zlib.h>
|
||||
+#endif
|
||||
|
||||
struct png_struct_def
|
||||
{
|
||||
--- misc/libpng-1.5.1/pngtest.c 2011-02-03 05:58:17.000000000 +0100
|
||||
+++ misc/build/libpng-1.5.1/pngtest.c 2011-03-02 16:30:09.881914600 +0100
|
||||
@@ -31,7 +31,12 @@
|
||||
* of files at once by typing "pngtest -m file1.png file2.png ..."
|
||||
*/
|
||||
|
||||
+#if defined MACOSX
|
||||
#include "zlib.h"
|
||||
+#else
|
||||
+#include <external/zlib/zlib.h>
|
||||
+#endif
|
||||
+
|
||||
#include "png.h"
|
||||
/* Copied from pngpriv.h but only used in error messages below. */
|
||||
#ifndef PNG_ZBUF_SIZE
|
||||
--- misc/libpng-1.5.1/pngvalid.c 2011-02-03 05:58:17.000000000 +0100
|
||||
+++ misc/build/libpng-1.5.1/pngvalid.c 2011-03-02 19:15:38.583630100 +0100
|
||||
@@ -51,7 +51,11 @@ typedef png_byte *png_const_bytep;
|
||||
#define PNG_READ_16BIT_SUPPORTED
|
||||
#endif
|
||||
|
||||
-#include "zlib.h" /* For crc32 */
|
||||
+#if defined MACOSX
|
||||
+#include "zlib.h"
|
||||
+#else
|
||||
+#include <external/zlib/zlib.h>
|
||||
+#endif
|
||||
|
||||
#include <float.h> /* For floating point constants */
|
||||
#include <stdlib.h> /* For malloc */
|
||||
|
||||
|
|
|
|||
|
|
@ -48,16 +48,14 @@ TARFILE_NAME=$(PRJNAME)-$(LIBPNGVERSION)
|
|||
TARFILE_MD5=220035f111ea045a51e290906025e8b5
|
||||
|
||||
PATCH_FILES=libpng.patch
|
||||
ADDITIONAL_FILES=makefile.mk
|
||||
ADDITIONAL_FILES=makefile.mk pnglibconf.h
|
||||
|
||||
#relative to CONFIGURE_DIR
|
||||
|
||||
BUILD_DIR=$(CONFIGURE_DIR)
|
||||
BUILD_ACTION=dmake $(MFLAGS) $(CALLMACROS)
|
||||
|
||||
OUT2INC=png.h \
|
||||
pngconfig.h \
|
||||
pnglibconfig.h
|
||||
OUT2INC=png.h pnglibconf.h
|
||||
|
||||
# --- Targets ------------------------------------------------------
|
||||
|
||||
|
|
|
|||
|
|
@ -1,12 +1,9 @@
|
|||
mkdir: %_DEST%\inc%_EXT%\libpng
|
||||
..\%__SRC%\inc\png*.h %_DEST%\inc%_EXT%\libpng\png*.h
|
||||
mkdir: %_DEST%\inc%_EXT%\external
|
||||
mkdir: %_DEST%\inc%_EXT%\external\libpng
|
||||
|
||||
..\%__SRC%\slb\libpng.lib %_DEST%\lib%_EXT%\libpng.lib
|
||||
..\%__SRC%\lib\libpng.a %_DEST%\lib%_EXT%\libpng.a
|
||||
|
||||
..\%__SRC%\inc\png.h %_DEST%\inc%_EXT%\external\libpng\png.h
|
||||
..\%__SRC%\inc\pnglibconf.h %_DEST%\inc%_EXT%\external\libpng\pnglibconf.h
|
||||
|
||||
..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%\lib*.so
|
||||
..\%__SRC%\lib\lib*.so.* %_DEST%\lib%_EXT%\lib*.so.*
|
||||
..\%__SRC%\lib\lib*.dylib %_DEST%\lib%_EXT%\lib*.dylib
|
||||
..\%__SRC%\lib\lib*.a %_DEST%\lib%_EXT%\lib*.a
|
||||
..\%__SRC%\lib\lib*.la %_DEST%\lib%_EXT%\lib*.la
|
||||
..\%__SRC%\lib\*.lib %_DEST%\lib%_EXT%\*.lib
|
||||
..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\*.dll
|
||||
..\%__SRC%\lib\*.dll %_DEST%\bin%_EXT%\*.dll
|
||||
..\%__SRC%\bin\*.dll.a %_DEST%\lib%_EXT%\*.a
|
||||
|
|
|
|||
Loading…
Reference in a new issue