diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 00c008f5c0..aecac4e443 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -17,6 +17,13 @@ past entries belonging to author(s): Viktor Szakats. */ +2010-04-11 09:25 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) + * external/pcre/Makefile + ! Fixed to compile 8.02 with msvc and bcc. + + * package/winuni/RELNOTES + * Updated external package versions. + 2010-04-10 19:35 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com) * contrib/hbqt/qtcore/*.cpp * contrib/hbqt/qtgui/*.cpp @@ -39,8 +46,8 @@ - Removed some loggings. % Reworked how build commands are called. Now only one batch file - is sent to the process engine to fire and rest is contained - into that batch file. It probably may solve *nix issue where + is sent to the process engine to fire and rest is contained + into that batch file. It probably may solve *nix issue where a .sh is not executed or any other command with long list of params. 2010-04-10 12:04 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com) diff --git a/harbour/external/pcre/Makefile b/harbour/external/pcre/Makefile index ac49d9aac0..3b4c44ffaf 100644 --- a/harbour/external/pcre/Makefile +++ b/harbour/external/pcre/Makefile @@ -37,6 +37,12 @@ ifneq ($(HB_HAS_PCRE_LOCAL),) HB_CFLAGS += -DPCRE_STATIC -DHAVE_STDINT_H=0 + ifneq ($(filter $(HB_COMPILER),bcc msvc msvc64 msvcia64 icc iccia64),) + HB_CFLAGS += -DHAVE_INTTYPES_H=0 + endif + + HB_CFLAGS += -DHAVE_CONFIG_H + # workaround for problems in sunpro x86 PIC builds exploited by hbpcre library code ifeq ($(HB_COMPILER),sunpro) ifeq ($(HB_PLATFORM),sunos) @@ -48,14 +54,11 @@ ifneq ($(HB_HAS_PCRE_LOCAL),) endif endif - # suppress bcc warnings and tweak to make it build + # suppress bcc warnings ifeq ($(HB_COMPILER),bcc) HB_CFLAGS += -w-use -w-csu -w-aus -w-sig - HB_CFLAGS += -DHAVE_INTTYPES_H=0 endif - HB_CFLAGS += -DHAVE_CONFIG_H - include $(TOP)$(ROOT)config/lib.mk else HB_SKIP_REASON := unused diff --git a/harbour/package/winuni/RELNOTES b/harbour/package/winuni/RELNOTES index 4d0aef5dd0..f1ae70f492 100644 --- a/harbour/package/winuni/RELNOTES +++ b/harbour/package/winuni/RELNOTES @@ -58,12 +58,12 @@ Tool/lib versions used to create this package: Allegro 4.2.2 Blat 2.6.2 Cairo 1.8.8 - libcurl 7.19.6 + libcurl 7.20.0 Firebird 2.5.0rc1 FreeImage 3.13.0 GD 2.0.35 MySQL 5.1.41 - OpenSSL 0.9.8k + OpenSSL 1.0.0 PostgreSQL 8.4.2-1 QT 4.5.3 WATTCP 2.2.10