From 8a905fadd5ae9902a15bf30fa4b340706ff52496 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Sun, 19 Oct 2008 07:21:55 +0000 Subject: [PATCH] 2008-10-19 09:16 UTC+0200 Viktor Szakats (harbour.01 syenar hu) * common.mak * contrib/mtpl_b32.mak * contrib/mtpl_gcc.mak * contrib/mtpl_vc.mak + Made -gc3 switch the default. This will result in noticeably faster .prg code execution at the cost of a slightly bigger executable. Speaking of the core, this can result at maximum 250K of extra executable size increase, if the final executable uses _all_ core .prg functions. Usually though it's much lower than that, especially for GUI programs, since the majority of core .prg code deals with CUI elements, like TBrowse(), TGet(), 5.3 compatible CUI controls, .frm and .lbl support, MemoEdit(). * contrib/examples/dbu/bld_b32.bat * contrib/examples/dbu/bld_vc.bat * utils/hbdoc/bld_vc.bat * utils/hbdoc/bld_b32.bat * utils/hbmake/bld_b32.bat * utils/hbmake/bld_vc.bat + Added -l Harbour switch. --- harbour/ChangeLog | 24 ++++++++++++++++++++++++ harbour/common.mak | 2 +- harbour/contrib/examples/dbu/bld_b32.bat | 18 +++++++++--------- harbour/contrib/examples/dbu/bld_vc.bat | 18 +++++++++--------- harbour/contrib/mtpl_b32.mak | 2 +- harbour/contrib/mtpl_gcc.mak | 2 +- harbour/contrib/mtpl_vc.mak | 2 +- harbour/utils/hbdoc/bld_b32.bat | 2 +- harbour/utils/hbdoc/bld_vc.bat | 2 +- harbour/utils/hbmake/bld_b32.bat | 2 +- harbour/utils/hbmake/bld_vc.bat | 2 +- 11 files changed, 50 insertions(+), 26 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 4e41a8f6ab..b4df86de0d 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,30 @@ 2008-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org) */ +2008-10-19 09:16 UTC+0200 Viktor Szakats (harbour.01 syenar hu) + * common.mak + * contrib/mtpl_b32.mak + * contrib/mtpl_gcc.mak + * contrib/mtpl_vc.mak + + Made -gc3 switch the default. This will result in + noticeably faster .prg code execution at the cost of + a slightly bigger executable. Speaking of the core, + this can result at maximum 250K of extra executable + size increase, if the final executable uses _all_ + core .prg functions. Usually though it's much lower + than that, especially for GUI programs, since the + majority of core .prg code deals with CUI elements, + like TBrowse(), TGet(), 5.3 compatible CUI controls, + .frm and .lbl support, MemoEdit(). + + * contrib/examples/dbu/bld_b32.bat + * contrib/examples/dbu/bld_vc.bat + * utils/hbdoc/bld_vc.bat + * utils/hbdoc/bld_b32.bat + * utils/hbmake/bld_b32.bat + * utils/hbmake/bld_vc.bat + + Added -l Harbour switch. + 2008-10-19 09:00 UTC+0200 Viktor Szakats (harbour.01 syenar hu) * include/hbextern.ch * include/assert.ch diff --git a/harbour/common.mak b/harbour/common.mak index 830c09efa7..6b6c707f67 100644 --- a/harbour/common.mak +++ b/harbour/common.mak @@ -89,7 +89,7 @@ INCLUDE_DIR = include # Harbour Compiler Flags #********************************************************** -HBFLAGSCMN = -i$(INCLUDE_DIR) -q0 -w3 -es2 -km -l $(PRG_USR) +HBFLAGSCMN = -i$(INCLUDE_DIR) -q0 -w3 -es2 -gc3 -km -l $(PRG_USR) !if "$(HB_BUILD_DEBUG)" == "yes" HBFLAGSCMN = $(HBFLAGSCMN) -l- !endif diff --git a/harbour/contrib/examples/dbu/bld_b32.bat b/harbour/contrib/examples/dbu/bld_b32.bat index a8441c59e9..a704fdc8c5 100644 --- a/harbour/contrib/examples/dbu/bld_b32.bat +++ b/harbour/contrib/examples/dbu/bld_b32.bat @@ -23,15 +23,15 @@ if exist hb_dbu.dif patch -N -i hb_dbu.dif :DIR_OK -..\..\..\bin\harbour /n %HB_DIR_DBU%\DBU.PRG /i..\..\..\include\ -..\..\..\bin\harbour /n %HB_DIR_DBU%\DBUCOPY.PRG /i..\..\..\include\ -..\..\..\bin\harbour /n %HB_DIR_DBU%\DBUEDIT.PRG /i..\..\..\include\ -..\..\..\bin\harbour /n %HB_DIR_DBU%\DBUHELP.PRG /i..\..\..\include\ -..\..\..\bin\harbour /n %HB_DIR_DBU%\DBUINDX.PRG /i..\..\..\include\ -..\..\..\bin\harbour /n %HB_DIR_DBU%\DBUNET.PRG /i..\..\..\include\ -..\..\..\bin\harbour /n %HB_DIR_DBU%\DBUSTRU.PRG /i..\..\..\include\ -..\..\..\bin\harbour /n %HB_DIR_DBU%\DBUUTIL.PRG /i..\..\..\include\ -..\..\..\bin\harbour /n %HB_DIR_DBU%\DBUVIEW.PRG /i..\..\..\include\ +..\..\..\bin\harbour -q -n -l -i..\..\..\include %HB_DIR_DBU%\DBU.PRG +..\..\..\bin\harbour -q -n -l -i..\..\..\include %HB_DIR_DBU%\DBUCOPY.PRG +..\..\..\bin\harbour -q -n -l -i..\..\..\include %HB_DIR_DBU%\DBUEDIT.PRG +..\..\..\bin\harbour -q -n -l -i..\..\..\include %HB_DIR_DBU%\DBUHELP.PRG +..\..\..\bin\harbour -q -n -l -i..\..\..\include %HB_DIR_DBU%\DBUINDX.PRG +..\..\..\bin\harbour -q -n -l -i..\..\..\include %HB_DIR_DBU%\DBUNET.PRG +..\..\..\bin\harbour -q -n -l -i..\..\..\include %HB_DIR_DBU%\DBUSTRU.PRG +..\..\..\bin\harbour -q -n -l -i..\..\..\include %HB_DIR_DBU%\DBUUTIL.PRG +..\..\..\bin\harbour -q -n -l -i..\..\..\include %HB_DIR_DBU%\DBUVIEW.PRG echo -O2 -I..\..\..\include -L..\..\..\lib > build.tmp diff --git a/harbour/contrib/examples/dbu/bld_vc.bat b/harbour/contrib/examples/dbu/bld_vc.bat index eec4ff4dcc..149630eb5c 100644 --- a/harbour/contrib/examples/dbu/bld_vc.bat +++ b/harbour/contrib/examples/dbu/bld_vc.bat @@ -23,15 +23,15 @@ if exist hb_dbu.dif patch -N -i hb_dbu.dif :DIR_OK -..\..\..\bin\harbour /n %HB_DIR_DBU%\DBU.PRG /i..\..\..\include\ -..\..\..\bin\harbour /n %HB_DIR_DBU%\DBUCOPY.PRG /i..\..\..\include\ -..\..\..\bin\harbour /n %HB_DIR_DBU%\DBUEDIT.PRG /i..\..\..\include\ -..\..\..\bin\harbour /n %HB_DIR_DBU%\DBUHELP.PRG /i..\..\..\include\ -..\..\..\bin\harbour /n %HB_DIR_DBU%\DBUINDX.PRG /i..\..\..\include\ -..\..\..\bin\harbour /n %HB_DIR_DBU%\DBUNET.PRG /i..\..\..\include\ -..\..\..\bin\harbour /n %HB_DIR_DBU%\DBUSTRU.PRG /i..\..\..\include\ -..\..\..\bin\harbour /n %HB_DIR_DBU%\DBUUTIL.PRG /i..\..\..\include\ -..\..\..\bin\harbour /n %HB_DIR_DBU%\DBUVIEW.PRG /i..\..\..\include\ +..\..\..\bin\harbour -q -n -l -i..\..\..\include %HB_DIR_DBU%\DBU.PRG +..\..\..\bin\harbour -q -n -l -i..\..\..\include %HB_DIR_DBU%\DBUCOPY.PRG +..\..\..\bin\harbour -q -n -l -i..\..\..\include %HB_DIR_DBU%\DBUEDIT.PRG +..\..\..\bin\harbour -q -n -l -i..\..\..\include %HB_DIR_DBU%\DBUHELP.PRG +..\..\..\bin\harbour -q -n -l -i..\..\..\include %HB_DIR_DBU%\DBUINDX.PRG +..\..\..\bin\harbour -q -n -l -i..\..\..\include %HB_DIR_DBU%\DBUNET.PRG +..\..\..\bin\harbour -q -n -l -i..\..\..\include %HB_DIR_DBU%\DBUSTRU.PRG +..\..\..\bin\harbour -q -n -l -i..\..\..\include %HB_DIR_DBU%\DBUUTIL.PRG +..\..\..\bin\harbour -q -n -l -i..\..\..\include %HB_DIR_DBU%\DBUVIEW.PRG cl -D_CRT_SECURE_NO_DEPRECATE -nologo -O2 -W3 -I..\..\..\include dbu.c dbucopy.c dbuedit.c dbuhelp.c dbuindx.c dbunet.c dbustru.c dbuutil.c dbuview.c /link /subsystem:CONSOLE /LIBPATH:..\..\..\lib hbcpage.lib hbdebug.lib hbvm.lib hbrtl.lib gtwin.lib hblang.lib hbrdd.lib hbmacro.lib hbpp.lib rddntx.lib rddcdx.lib rddfpt.lib hbsix.lib hbcommon.lib hbpcre.lib hbzlib.lib user32.lib gdi32.lib diff --git a/harbour/contrib/mtpl_b32.mak b/harbour/contrib/mtpl_b32.mak index 6d4ccd08e8..57d1671c8b 100644 --- a/harbour/contrib/mtpl_b32.mak +++ b/harbour/contrib/mtpl_b32.mak @@ -120,7 +120,7 @@ CFLAGS = -I$(INCLUDE_DIR) $(C_USR) $(CFLAGS) #********************************************************** CLIBFLAGS = -c -q -d -Q -w -w-sig- $(CFLAGS) $(CLIBFLAGS) -HARBOURFLAGS = -i$(INCLUDE_DIR) -n -q0 -w3 -es2 -km -l $(PRG_USR) $(HARBOURFLAGS) +HARBOURFLAGS = -i$(INCLUDE_DIR) -n -q0 -w3 -es2 -gc3 -km -l $(PRG_USR) $(HARBOURFLAGS) !if "$(HB_BUILD_DEBUG)" == "yes" HARBOURFLAGS = $(HARBOURFLAGS) -l- !endif diff --git a/harbour/contrib/mtpl_gcc.mak b/harbour/contrib/mtpl_gcc.mak index 8be582fa1f..d69413260d 100644 --- a/harbour/contrib/mtpl_gcc.mak +++ b/harbour/contrib/mtpl_gcc.mak @@ -120,7 +120,7 @@ endif CFLAGS := -W -Wall -I$(INCLUDE_DIR) $(C_USR) $(CFLAGS) CLIBFLAGS := -c $(CFLAGS) $(CLIBFLAGS) -HARBOURFLAGS := -i$(INCLUDE_DIR) -n -q0 -w3 -es2 -km -l $(PRG_USR) $(HARBOURFLAGS) +HARBOURFLAGS := -i$(INCLUDE_DIR) -n -q0 -w3 -es2 -gc3 -km -l $(PRG_USR) $(HARBOURFLAGS) ifeq ($(HB_BUILD_DEBUG),yes) HARBOURFLAGS := $(HARBOURFLAGS) -l- endif diff --git a/harbour/contrib/mtpl_vc.mak b/harbour/contrib/mtpl_vc.mak index 17d314f143..f9a0152860 100644 --- a/harbour/contrib/mtpl_vc.mak +++ b/harbour/contrib/mtpl_vc.mak @@ -127,7 +127,7 @@ CFLAGS = -Zi $(CFLAGS) #********************************************************** CLIBFLAGS = -c $(CFLAGS) $(CLIBFLAGS) -HARBOURFLAGS = -i$(INCLUDE_DIR) -n -q0 -w3 -es2 -km -l $(PRG_USR) $(HARBOURFLAGS) +HARBOURFLAGS = -i$(INCLUDE_DIR) -n -q0 -w3 -es2 -gc3 -km -l $(PRG_USR) $(HARBOURFLAGS) !if "$(HB_BUILD_DEBUG)" == "yes" HARBOURFLAGS = $(HARBOURFLAGS) -l- !endif diff --git a/harbour/utils/hbdoc/bld_b32.bat b/harbour/utils/hbdoc/bld_b32.bat index efea535e78..c99d7b1a67 100644 --- a/harbour/utils/hbdoc/bld_b32.bat +++ b/harbour/utils/hbdoc/bld_b32.bat @@ -3,7 +3,7 @@ rem rem $Id$ rem -..\..\bin\harbour /w3 /q /n /km /i..\..\include hbdoc ft_funcs genasc genchm genhpc genhtm genng genos2 genpdf1 genrtf gentrf +..\..\bin\harbour -w3 -q -n -km -l -i..\..\include hbdoc ft_funcs genasc genchm genhpc genhtm genng genos2 genpdf1 genrtf gentrf echo -O2 -I..\..\include -L..\..\lib > build.tmp diff --git a/harbour/utils/hbdoc/bld_vc.bat b/harbour/utils/hbdoc/bld_vc.bat index a648e41b98..1365fe80b4 100644 --- a/harbour/utils/hbdoc/bld_vc.bat +++ b/harbour/utils/hbdoc/bld_vc.bat @@ -3,7 +3,7 @@ rem rem $Id$ rem -..\..\bin\harbour /w3 /q /n /km /i..\..\include hbdoc ft_funcs genasc genchm genhpc genhtm genng genos2 genpdf1 genrtf gentrf +..\..\bin\harbour -w3 -q -n -km -l -i..\..\include hbdoc ft_funcs genasc genchm genhpc genhtm genng genos2 genpdf1 genrtf gentrf cl -D_CRT_SECURE_NO_DEPRECATE -nologo -O2 -W3 -I..\..\include hbdoc.c ft_funcs.c genasc.c genchm.c genhpc.c genhtm.c genng.c genos2.c genpdf1.c genrtf.c gentrf.c hbdfrdln.c /link /subsystem:CONSOLE /LIBPATH:..\..\lib hbvm.lib hbrtl.lib gtwin.lib hbnulrdd.lib hbmacro.lib hbcommon.lib user32.lib diff --git a/harbour/utils/hbmake/bld_b32.bat b/harbour/utils/hbmake/bld_b32.bat index 97075bd86d..2927c2f7ce 100644 --- a/harbour/utils/hbmake/bld_b32.bat +++ b/harbour/utils/hbmake/bld_b32.bat @@ -3,7 +3,7 @@ rem rem $Id$ rem -..\..\bin\harbour /w3 /q /n /km /i..\..\include hbmake +..\..\bin\harbour -w3 -q -n -km -l -i..\..\include hbmake echo -O2 -I..\..\include -L..\..\lib > build.tmp diff --git a/harbour/utils/hbmake/bld_vc.bat b/harbour/utils/hbmake/bld_vc.bat index d40b5acb29..ad605d933c 100644 --- a/harbour/utils/hbmake/bld_vc.bat +++ b/harbour/utils/hbmake/bld_vc.bat @@ -3,7 +3,7 @@ rem rem $Id$ rem -..\..\bin\harbour /w3 /q /n /km /i..\..\include hbmake +..\..\bin\harbour -w3 -q -n -km -l -i..\..\include hbmake cl -D_CRT_SECURE_NO_DEPRECATE -nologo -O2 -W3 -I..\..\include hbmake.c hbmfrdln.c hbmgauge.c hbmlang.c /link /subsystem:CONSOLE /LIBPATH:..\..\lib hbvm.lib hbrtl.lib gtwin.lib hbnulrdd.lib hbmacro.lib hbcommon.lib user32.lib