From f540f4af119689800f659847f54d543e2d7a49f4 Mon Sep 17 00:00:00 2001 From: Marek Paliwoda Date: Sun, 19 Aug 2007 16:48:49 +0000 Subject: [PATCH] 2007-08-19 18:35 UTC+0100 Marek Paliwoda (mpaliwoda at interia pl) * harbour/makefile.bc * harbour/makefile.vc * harbour/makefile.gc + Added more descripion in a makefile's headers % Minor makefile cleanup --- harbour/ChangeLog | 23 ++++++++++------ harbour/makefile.bc | 2 ++ harbour/makefile.gc | 64 +++++++++++++++++++++------------------------ harbour/makefile.vc | 4 ++- 4 files changed, 50 insertions(+), 43 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 54e680e149..e3d3de1973 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,21 +8,28 @@ 2002-12-01 13:30 UTC+0100 Foo Bar */ +2007-08-19 18:35 UTC+0100 Marek Paliwoda (mpaliwoda at interia pl) + * harbour/makefile.bc + * harbour/makefile.vc + * harbour/makefile.gc + + Added more descripion in a makefile's headers + % Minor makefile cleanup + 2007-08-19 17:00 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) * source/rtl/tgetlist.prg - ! Fixed crash when bad date is detected. (:TypeOut was + ! Fixed crash when bad date is detected. (:TypeOut was used in an assignment) 2007-08-19 12:58 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) * source/rtl/tget.prg - ! Fixed bug where negative number in get buffer beginning - with a decimal sign was erroneously converted back to + ! Fixed bug where negative number in get buffer beginning + with a decimal sign was erroneously converted back to a numeric. (like: -.58) % Minor optimization in @E handling. 2007-08-19 05:14 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) * source/rtl/tget.prg - ! Fixed bug where mask was missing for date var type when + ! Fixed bug where mask was missing for date var type when no explicit picture was used. * contrib/libct/makefile.bc @@ -111,10 +118,10 @@ * include/hbextern.ch * contrib/libnf/fttext.c * source/vm/arrayshb.c - + xhb RASCAN() added to Harbour without HB_COMPAT_XHB + + xhb RASCAN() added to Harbour without HB_COMPAT_XHB switch, under the name HB_RASCAN(). Translation from RASCAN() is done via hbcompat.ch - ! NFLib/FT_FRSEEK() now works in Harbour regardless + ! NFLib/FT_FRSEEK() now works in Harbour regardless of the HB_COMPAT switches. 2007-08-08 15:44 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) @@ -600,7 +607,7 @@ * source/codepage/Makefile + source/codepage/ucmik.c + source/codepage/cpbgmik.c - + Added BGMIK codepage and Bulgarian MIK unicode conversion + + Added BGMIK codepage and Bulgarian MIK unicode conversion table from xHarbour. ! Changed internal ID "MIK" to "bg-mik". @@ -615,7 +622,7 @@ + source/codepage/cpskiso.c + source/codepage/cpskwin.c + source/codepage/cpskkam.c - + Added Slovak codepages. Pls. test them if you are + + Added Slovak codepages. Pls. test them if you are familiar with the language rules. 2007-07-24 19:40 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) diff --git a/harbour/makefile.bc b/harbour/makefile.bc index 728abb692a..935308ec5b 100644 --- a/harbour/makefile.bc +++ b/harbour/makefile.bc @@ -30,6 +30,8 @@ # HARBOURFLAGSDLL - Extra Harbour compiler options for shared libraries # PRG_USR - Extra Harbour compiler options # (GNU make compatible envvar) +# HB_GT_DEFAULT - The default GT driver, Choose between : +# gtstd (default),gtcgi,gtwin,gtwvt # HB_GT_LIB - To override the default GT driver # (search for HB_GT_LIBS for a list of values) # HB_BUILD_DLL - If set to yes enables building harbour VM+RTL diff --git a/harbour/makefile.gc b/harbour/makefile.gc index 21e77a5607..7afb52df3a 100644 --- a/harbour/makefile.gc +++ b/harbour/makefile.gc @@ -3,7 +3,7 @@ # # -# Makefile for Harbour Project for Borland C/C++ 5.x compilers +# Makefile for Harbour Project for GNU gcc compiler # # --------------------------------------------------------------- @@ -16,48 +16,45 @@ # NOTE: You can use these envvars to configure the make process: # (note that these are all optional) # -# CFLAGS - Extra C compiler options for libraries and for -# executables -# C_USR - Extra C compiler options for libraries and for -# executables (GNU make compatible envvar) -# CLIBFLAGS - Extra C compiler options for the static libraries +# CFLAGS - Extra C compiler options for libraries and for +# executables +# C_USR - Extra C compiler options for libraries and for +# executables (GNU make compatible envvar) +# CLIBFLAGS - Extra C compiler options for the static libraries # CLIBFLAGSDLL - Extra C compiler options for the shared libraries # -# LDFLAGS - Extra linker options for the static libraries -# LDFLAGSDLL - Extra linker options for the shared libraries +# LDFLAGS - Extra linker options for the static libraries +# LDFLAGSDLL - Extra linker options for the shared libraries # # HARBOURFLAGS - Extra Harbour compiler options for static libs/exes # HARBOURFLAGSDLL - Extra Harbour compiler options for shared libraries -# PRG_USR - Extra Harbour compiler options +# PRG_USR - Extra Harbour compiler options # (GNU make compatible envvar) -# HB_GT_LIB - To override the default GT driver -# (search for HB_GT_LIBS for a list of values) +# HB_GT_DEFAULT - The default GT driver, Choose between : +# gtstd (default),gtcgi,gtpca,gttrm,gtcrs,gtsln,gtxwc +# HB_GT_LIB - Set if you want to override the default GT driver +# (search for HB_GT_LIBS for a list of values) +# +# HB_GPM_MOUSE - If set to yes enables using GPM mouse driver on console +# HB_WITHOUT_GTSLN - If set to yes causes to not build gtsln +# (if you don't have slang installed) +# +# HB_COMMERCE - If set to yes disables pure GNU modules (slang,GPM,...) # HB_BUILD_DLL - If set to yes enables building harbour VM+RTL -# dll in addition to normal static build +# dll in addition to normal static build (currently not working) # HB_BUILD_DEBUG - If set to yes causes to compile with debug info # HB_BUILD_VERBOSE - enables echoing commands being executed # HB_REBUILD_PARSER - If set to yes force preprocessing new rules by -# bison (you must use bison 2.3 or later) -# BCCDLL_WITH_DYNRT - If set to -tWR causes that harbour-bc.dll -# will use dynamic runtime library (recommended) +# bison (you must use bison 2.3 or later) +# # HB_INSTALL_PREFIX - Path to instalation directory into which -# Harbour will be installed when the command -# "make_bc.bat install" is lauched. Defaults -# to current directory +# Harbour will be installed when the command +# "make_gcc.bat install" is lauched. Defaults +# to current directory # -# HB_DOC_PDF - Turns on the .PDF file support in the HBDOC utility. -# Note that this will require the pdflib contrib. +# HB_DOC_PDF - Turns on the .PDF file support in the HBDOC utility. +# Note that this will require the pdflib contrib. -# --------------------------------------------------------------- -# "echo." intentionally used instead of "echo", to avoid conflicts -# with external commands named echo. -# using macros for ECHO and DEL to allow overiding such as: -# -# set ECHO=cmd /c echo -# set DEL=cmd /c del -# -# The above might be needed on Windows 2000 and XP. -# The macros are referenced in makefile.bc # --------------------------------------------------------------- .SUFFIXES: @@ -92,8 +89,8 @@ endif #********************************************************** -# Include Common Object list files -# shared between Msvc and Borland +# Include Common Object list files shared +# between Msvc, Borland and Gcc compilers include common.cf @@ -140,7 +137,7 @@ INCLUDE_DIR := include CFLAGS := -W -Wall -I$(INCLUDE_DIR) $(C_USR) $(CFLAGS) -Iobj/$(CC_DIRNAME) #----------- ifndef GCC_NOOPTIM - CFLAGS := -O3 $(CFLAGS) +CFLAGS := -O3 $(CFLAGS) endif #----------- ifeq ($(HB_BUILD_DEBUG),yes) @@ -502,7 +499,6 @@ doClean: -$(DEL) $(DLL_OBJ_DIR)/*.h -$(DEL) $(PP_DIR)/pptable.c -$(DEL) inst_$(CC_DIRNAME).log - -$(DEL) gtlibs.cf -$(DEL) common.cf #********************************************************** diff --git a/harbour/makefile.vc b/harbour/makefile.vc index f3f8dde11d..ca5b5ab5a9 100644 --- a/harbour/makefile.vc +++ b/harbour/makefile.vc @@ -3,7 +3,7 @@ # # -# Makefile for Harbour Project for Msvc 6.0/7.1 compilers +# Makefile for Harbour Project for Msvc compilers # # --------------------------------------------------------------- @@ -30,6 +30,8 @@ # HARBOURFLAGSDLL - Extra Harbour compiler options for shared libraries # PRG_USR - Extra Harbour compiler options # (GNU make compatible envvar) +# HB_GT_DEFAULT - The default GT driver, Choose between : +# gtstd (default),gtcgi,gtwin,gtwvt # HB_GT_LIB - To override the default GT driver # (search for HB_GT_LIBS for a list of values) # HB_BUILD_DLL - If set to yes enables building harbour VM+RTL