b704a9d436
* external/libpng/LICENSE
* external/libpng/Makefile
* external/libpng/png.c
* external/libpng/png.h
* external/libpng/pngrio.c
* external/libpng/pngerror.c
* external/libpng/pngconf.h
* external/libpng/pngwrite.c
* external/libpng/pngset.c
* external/libpng/pngpread.c
* external/libpng/pngwtran.c
* external/libpng/pngwio.c
* external/libpng/pngrutil.c
* external/libpng/pngwutil.c
* external/libpng/pngread.c
* external/libpng/pngmem.c
* external/libpng/pngget.c
* external/libpng/pngrtran.c
* external/libpng/pngtrans.c
- external/libpng/pngvcrd.c
- external/libpng/pnggccrd.c
+ external/libpng/pngpriv.h
* Updated to 1.4.0 (from 1.2.40)
* external/libpng/Makefile
+ Added -DPNG_NO_SETJMP for watcom builds to prevent these errors
from happening:
wcc386 -zq -bt=nt -bm -w0 -6s -fp6 -onaehtr -s -ei -zp4 -zt0 -oi -i. -i..\..\..\..\..\include -IF:\work\harbour\harbour\external\zlib -DUSE_FAR_KEYWORD -fo=pngread.obj ..\..\..\pngread.c
..\..\..\pngread.c(86): Error! E1071: Type of parameter 2 does not agree with previous definition
..\..\..\pngread.c(86): Note! N2003: source conversion type is 'void (__watcall *)(unsigned int __p1[],int __p2)'
..\..\..\pngread.c(86): Note! N2004: target conversion type is 'void (__cdecl *)(unsigned int __p1[],int __p2)'
wcc386 -zq -bt=nt -bm -w0 -6s -fp6 -onaehtr -s -ei -zp4 -zt0 -oi -i. -i..\..\..\..\..\include -IF:\work\harbour\harbour\external\zlib -fo=pngwrite.obj ..\.
.\..\pngwrite.c
..\..\..\pngwrite.c(507): Error! E1071: Type of parameter 2 does not agree with previous definition
..\..\..\pngwrite.c(507): Note! N2003: source conversion type is 'void (__watcall *)(unsigned int __p1[],int __p2)'
..\..\..\pngwrite.c(507): Note! N2004: target conversion type is 'void (__cdecl *)(unsigned int __p1[],int __p2)'
* external/sqlite3/sqlite3.c
* external/sqlite3/sqlite3.h
+ sqlite upgraded to 3.6.22 (from 3.6.21)
69 lines
1.4 KiB
Makefile
69 lines
1.4 KiB
Makefile
#
|
|
# $Id$
|
|
#
|
|
|
|
ROOT := ../../
|
|
|
|
include $(TOP)$(ROOT)config/global.mk
|
|
|
|
LIBNAME := libpng
|
|
|
|
HB_BUILD_WARN := no
|
|
HB_BUILD_MODE := c
|
|
|
|
C_SOURCES := \
|
|
png.c \
|
|
pngerror.c \
|
|
pngget.c \
|
|
pngmem.c \
|
|
pngpread.c \
|
|
pngread.c \
|
|
pngrio.c \
|
|
pngrtran.c \
|
|
pngrutil.c \
|
|
pngset.c \
|
|
pngtrans.c \
|
|
pngwio.c \
|
|
pngwrite.c \
|
|
pngwtran.c \
|
|
pngwutil.c \
|
|
|
|
ifeq ($(filter $(HB_COMPILER),poccarm xcc),)
|
|
|
|
_DET_DSP_NAME := libpng
|
|
_DET_VAR_INC_ := HB_INC_PNG
|
|
_DET_VAR_HAS_ := HB_HAS_PNG
|
|
_DET_FLT_PLAT :=
|
|
_DET_FLT_COMP :=
|
|
_DET_INC_DEFP := /usr/include /boot/develop/headers/3rdparty
|
|
_DET_INC_LOCL := $(realpath $(TOP)$(ROOT)external/libpng)
|
|
_DET_INC_HEAD := /png.h
|
|
include $(TOP)$(ROOT)config/detfun.mk
|
|
|
|
ifneq ($(HB_HAS_PNG_LOCAL),)
|
|
|
|
ifneq ($(HB_HAS_ZLIB),)
|
|
|
|
HB_CFLAGS += $(foreach d,$(HB_HAS_ZLIB),-I$(d))
|
|
|
|
ifeq ($(HB_COMPILER),djgpp)
|
|
HB_CFLAGS += -DPNG_NO_SNPRINTF
|
|
endif
|
|
ifeq ($(HB_COMPILER),watcom)
|
|
HB_CFLAGS += -DPNG_NO_SETJMP
|
|
endif
|
|
|
|
include $(TOP)$(ROOT)config/lib.mk
|
|
else
|
|
HB_SKIP_REASON := $(_DET_RES_TEXT)
|
|
include $(TOP)$(ROOT)config/none.mk
|
|
endif
|
|
else
|
|
HB_SKIP_REASON := unused
|
|
include $(TOP)$(ROOT)config/none.mk
|
|
endif
|
|
else
|
|
HB_SKIP_REASON := compiler not supported
|
|
include $(TOP)$(ROOT)config/none.mk
|
|
endif
|