fivedev/harbour-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2010-04-10 10:13 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)

Browse Source 
* external/zlib/zlib.dif
  * external/zlib/zconf.h
    ! Tweak to make it build with BCC (when this specific
      constant is defined, f.e. by libharu).

  * external/pcre/Makefile
    ! Tweak to make 8.02 work with BCC.
    ; NOTE: BCC is seemingly not tested/used by any important
            external projects. If it goes like this, I will stop
            doing these updates and leave them to real BCC users.
            It's going against the flow.

  * config/postinst.prg
    * /V2 -> -V2 to make *nix shells happy.
This commit is contained in:
Viktor Szakats
2010-04-10 08:18:05 +00:00
parent 5405a20528
commit 5823faadb1
5 changed files with 42 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
harbour/ChangeLog
View File

@@ -17,6 +17,22 @@
past entries belonging to author(s): Viktor Szakats.
*/
2010-04-10 10:13 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
* external/zlib/zlib.dif
* external/zlib/zconf.h
! Tweak to make it build with BCC (when this specific
constant is defined, f.e. by libharu).
* external/pcre/Makefile
! Tweak to make 8.02 work with BCC.
; NOTE: BCC is seemingly not tested/used by any important
external projects. If it goes like this, I will stop
doing these updates and leave them to real BCC users.
It's going against the flow.
* config/postinst.prg
* /V2 -> -V2 to make *nix shells happy.
2010-04-09 23:15 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
* harbour.spec
* utils/hbmk2/examples/contribf.hbc

2
harbour/config/postinst.prg
View File

@@ -192,7 +192,7 @@ PROCEDURE Main()
OutStd( "! Making Harbour .exe install package: '" + tmp + "'" + hb_osNewLine() )
hb_processRun( GetEnv( "HB_DIR_NSIS" ) + "makensis.exe" +;
" /V2" +;
" -V2" +;
" " + FN_Escape( "package\mpkg_win.nsi" ) )
ENDIF
ENDIF

3
harbour/external/pcre/Makefile vendored
View File

@@ -48,9 +48,10 @@ ifneq ($(HB_HAS_PCRE_LOCAL),)
endif
endif
# suppress bcc warnings
# suppress bcc warnings and tweak to make it build
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

2
harbour/external/zlib/zconf.h vendored
View File

@@ -371,9 +371,11 @@ typedef uLong FAR uLongf;
typedef Byte *voidp;
#endif
#if 0
#ifdef HAVE_UNISTD_H /* may be set to #if 1 by ./configure */
# define Z_HAVE_UNISTD_H
#endif
#endif
#ifdef Z_HAVE_UNISTD_H
# include <sys/types.h> /* for off_t */

22
harbour/external/zlib/zlib.dif vendored
View File

@@ -53,7 +53,16 @@ diff -u ori\deflate.c .\deflate.c
Only in .: ori
diff -u ori\zconf.h .\zconf.h
--- ori\zconf.h Sun Feb 21 16:38:24 2010
+++ .\zconf.h Fri Apr 09 14:34:48 2010
+++ .\zconf.h Sat Apr 10 10:04:40 2010
@@ -3,7 +3,7 @@
* For conditions of distribution and use, see copyright notice in zlib.h
*/
-/* @(#) $Id$ */
+/* @(#) $Id: zconf.h 14300 2010-04-09 12:44:20Z vszakats $ */
#ifndef ZCONF_H
#define ZCONF_H
@@ -140,7 +140,18 @@
#if defined(_WINDOWS) && !defined(WINDOWS)
# define WINDOWS
@@ -74,6 +83,17 @@ diff -u ori\zconf.h .\zconf.h
# ifndef WIN32
# define WIN32
# endif
@@ -360,8 +371,10 @@
typedef Byte *voidp;
#endif
+#if 0
#ifdef HAVE_UNISTD_H /* may be set to #if 1 by ./configure */
# define Z_HAVE_UNISTD_H
+#endif
#endif
#ifdef Z_HAVE_UNISTD_H
Only in .: zlib.dif
diff -u ori\zutil.c .\zutil.c
--- ori\zutil.c Sat Jan 09 15:23:48 2010