From c9521fc9a7420cbc8f846963da9c38bac7975818 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Tue, 1 Feb 2011 16:00:23 +0000 Subject: [PATCH] 2011-02-01 16:59 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) * src/3rd/zlib/Makefile ! Deleted ugly pocc64 workaround for zlib dynamic build. This should fix link errors when using HB_BUILD_CONTRIB_DYN=yes. --- harbour/ChangeLog | 6 ++++++ harbour/src/3rd/zlib/Makefile | 5 ----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index ffe09e5a60..c5b2dbad78 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,11 @@ The license applies to all entries newer than 2009-04-28. */ +2011-02-01 16:59 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) + * src/3rd/zlib/Makefile + ! Deleted ugly pocc64 workaround for zlib dynamic build. + This should fix link errors when using HB_BUILD_CONTRIB_DYN=yes. + 2011-02-01 16:06 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) * contrib/hbhpdf/3rd/libhpdf/libhpdf.hbp ! Fixed to build with pocc after recent png update. @@ -22009,6 +22014,7 @@ ../../../crc32.c(223): error #3151: [asm] Syntax error. ../../../crc32.c(223): error #3151: [asm] Syntax error. --- + [FIXED] * external/bzip2/Makefile ! Disabled for pocc64 (both 5 and 6), due to this error: diff --git a/harbour/src/3rd/zlib/Makefile b/harbour/src/3rd/zlib/Makefile index 0cde1c42db..c945840a06 100644 --- a/harbour/src/3rd/zlib/Makefile +++ b/harbour/src/3rd/zlib/Makefile @@ -11,11 +11,6 @@ LIBNAME := hbzlib HB_BUILD_WARN := no HB_BUILD_MODE := c -# Ugly workaround to avoid fatal error when building for pocc64 -ifneq ($(HB_COMPILER),pocc64) - HB_CFLAGS_DYN := -DZLIB_DLL -endif - C_SOURCES := \ adler32.c \ compress.c \