diff --git a/harbour/ChangeLog b/harbour/ChangeLog index bdf9295cb8..75d2437fb4 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,36 @@ 2009-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org) */ +2009-04-17 15:10 UTC+0200 Viktor Szakats (harbour.01 syenar hu) + * source/vm/Makefile + + Enabled "amalgamated" VM lib for all compilers/platforms, + except for those where this doesn't give any advantage, or + it breaks the build, these are: pocc*, xcc, bcc, dmc. + Please note that Open Watcom 1.7 might also fail (I didn't + test), so make sure to upgrade to 1.8. + + * harbour-win-spec + * harbour-wce-spec + * mpkg_win.bat + * mpkg_tgz.sh + * harbour.spec + * bin/hb-func.sh + * include/hbsetup.h + * source/vm/Makefile + * source/vm/fm.c + - source/vm/fm + - source/vm/fmmt + * utils/hbmk2/hbmk2.prg + - Removed hbfm and hbfmmt lib references. These libs are + no longer generated or used. + * Narrowed HB_FM_STATISTICS presence in various source + files. From now on the system default for all builds is + HB_FM_STATISTICS_OFF. We may change this to + HB_FM_STATISTICS_DYN_OFF if we find a solution to the + potential and actual problems with this method. + If someone needs to change mem stat default, it can be + done by ususal means. + 2009-04-17 10:48 UTC+0200 Viktor Szakats (harbour.01 syenar hu) * utils/hbmk2/hbmk2.prg + Added support for envvar HB_VISUALC_VER_PRE80 to signal diff --git a/harbour/bin/hb-func.sh b/harbour/bin/hb-func.sh index 4fabdcffba..ddd1b8fb49 100755 --- a/harbour/bin/hb-func.sh +++ b/harbour/bin/hb-func.sh @@ -314,8 +314,6 @@ if [ \$# = 0 ]; then -hwgui # link with HWGUI library (GTK+ interface) -l # link with library -L # additional path to search for libraries - -fmstat # link with the memory statistics lib - -nofmstat # do not link with the memory statistics lib (default) -[no]strip # strip (no strip) binaries -main= # set the name of main program function/procedure. # if not set then 'MAIN' is used or if it doesn't @@ -357,7 +355,6 @@ HB_GT="${HB_GT_LIB#gt}" HB_GPM_MOUSE="${HB_GPM_MOUSE}" HB_GT_REQ="" -HB_FM_REQ="" HB_STRIP="yes" HB_MAIN_FUNC="" HB_XBGTK="" @@ -401,8 +398,6 @@ while [ \$n -lt \${#P[@]} ]; do -hwgui) HB_HWGUI="yes" ;; -mt) HB_MT="MT" ;; -gt*) HB_GT_REQ="\${HB_GT_REQ} \${v#-gt}" ;; - -fmstat) HB_FM_REQ="STAT" ;; - -nofmstat) HB_FM_REQ="NOSTAT" ;; -strip) HB_STRIP="yes" ;; -nostrip) HB_STRIP="no" ;; -l[^-]*) HB_USRLIBS="\${HB_USRLIBS} \${v}" ;; @@ -508,7 +503,6 @@ for gt in \${HB_GT_REQ}; do fi # fi done -[ -n "\${HB_FM_REQ}" ] && HB_LNK_REQ="\${HB_LNK_REQ} HB_FM_\${HB_FM_REQ}" HB_LNK_ATTR="" HARBOUR_LIBS="" @@ -597,18 +591,6 @@ if [ -n "\${l}" ]; then [ -f "\${HB_LIB_INSTALL}/lib\${l}.a" ] && HARBOUR_LIBS="\${HARBOUR_LIBS} -l\${l}" fi -l="hbfm" -[ "\${HB_MT}" = "MT" ] && [ -f "\${HB_LIB_INSTALL}/lib\${l}mt.a" ] && l="\${l}mt" -if [ -f "\${HB_LIB_INSTALL}/lib\${l}.a" ] && \\ - ( [ -n "\${HB_FM_REQ}" ] || [ "\${HB_STATIC}" = "yes" ] ) && \\ - ( [ "\${HB_ARCHITECTURE}" != "wce" ] || [ "\${HB_FM_REQ}" = "STAT" ] ); then - if [ "\${HB_STATIC}" = "yes" ] && [ "\${HB_FM_REQ}" = "STAT" ]; then - HARBOUR_LIBS="-l\${l} \${HARBOUR_LIBS}" - else - HARBOUR_LIBS="\${HARBOUR_LIBS} -l\${l}" - fi -fi - if [ "\${HB_ARCHITECTURE}" = "darwin" ]; then CC_OPT="\${CC_OPT} -no-cpp-precomp -Wno-long-double" elif [ "\${HB_ARCHITECTURE}" = "sunos" ]; then diff --git a/harbour/harbour-wce-spec b/harbour/harbour-wce-spec index 34da0264f1..4f5eb4c748 100644 --- a/harbour/harbour-wce-spec +++ b/harbour/harbour-wce-spec @@ -89,7 +89,7 @@ rm -fR $RPM_BUILD_ROOT export HB_HOST_BUILD=yes export HB_ARCHITECTURE=linux export HB_COMPILER=gcc -export HB_USER_CFLAGS="-DHB_FM_STATISTICS_OFF" +export HB_USER_CFLAGS= make %{?_smp_mflags} export HB_HOST_BUILD=lib @@ -102,7 +102,7 @@ mkdir -p source/main/${HB_ARCHITECTURE}/${HB_COMPILER} ln -s ../../linux/gcc/harbour source/main/${HB_ARCHITECTURE}/${HB_COMPILER}/harbour.exe export CC_HB_USER_CFLAGS="" -export HB_USER_CFLAGS="$CC_HB_USER_CFLAGS -DHB_FM_STATISTICS_OFF" +export HB_USER_CFLAGS="$CC_HB_USER_CFLAGS" export HB_USER_PRGFLAGS="-D__PLATFORM__WINDOWS -undef:__PLATFORM__UNIX -undef:__PLATFORM__LINUX" export HB_USER_LDFLAGS="${CC_HB_USER_LDFLAGS}" export CC_HB_USER_PRGFLAGS="-D__PLATFORM__WINCE ${HB_USER_PRGFLAGS}" @@ -129,7 +129,7 @@ make %{?_smp_mflags} # Install harbour itself. export CC_HB_USER_CFLAGS="" -export HB_USER_CFLAGS="$CC_HB_USER_CFLAGS -DHB_FM_STATISTICS_OFF" +export HB_USER_CFLAGS="$CC_HB_USER_CFLAGS" export HB_USER_PRGFLAGS="-D__PLATFORM__WINDOWS -undef:__PLATFORM__UNIX -undef:__PLATFORM__LINUX" export HB_USER_LDFLAGS="${CC_HB_USER_LDFLAGS}" export CC_HB_USER_PRGFLAGS="-D__PLATFORM__WINCE ${HB_USER_PRGFLAGS}" @@ -308,8 +308,6 @@ rm -fR $RPM_BUILD_ROOT %{_libdir}/%{name}/libhbcommon.a %{_libdir}/%{name}/libhbcplr.a %{_libdir}/%{name}/libhbdebug.a -%{_libdir}/%{name}/libhbfm.a -%{_libdir}/%{name}/libhbfmmt.a %{_libdir}/%{name}/librddfpt.a %{_libdir}/%{name}/librddcdx.a %{_libdir}/%{name}/librddntx.a diff --git a/harbour/harbour-win-spec b/harbour/harbour-win-spec index f0843de935..2c284e5b06 100644 --- a/harbour/harbour-win-spec +++ b/harbour/harbour-win-spec @@ -89,7 +89,7 @@ rm -fR $RPM_BUILD_ROOT export HB_HOST_BUILD=yes export HB_ARCHITECTURE=linux export HB_COMPILER=gcc -export HB_USER_CFLAGS="-DHB_FM_STATISTICS_OFF" +export HB_USER_CFLAGS= make %{?_smp_mflags} export HB_HOST_BUILD=lib @@ -102,7 +102,7 @@ mkdir -p source/main/${HB_ARCHITECTURE}/${HB_COMPILER} ln -s ../../linux/gcc/harbour source/main/${HB_ARCHITECTURE}/${HB_COMPILER}/harbour.exe export CC_HB_USER_CFLAGS="" -export HB_USER_CFLAGS="$CC_HB_USER_CFLAGS -DHB_FM_STATISTICS_OFF" +export HB_USER_CFLAGS="$CC_HB_USER_CFLAGS" export CC_HB_USER_PRGFLAGS="-D__PLATFORM__WINDOWS -undef:__PLATFORM__UNIX -undef:__PLATFORM__LINUX" export HB_USER_PRGFLAGS="$CC_HB_USER_PRGFLAGS" export HB_USER_LDFLAGS="${CC_HB_USER_LDFLAGS}" @@ -129,7 +129,7 @@ make %{?_smp_mflags} # Install harbour itself. export CC_HB_USER_CFLAGS="" -export HB_USER_CFLAGS="$CC_HB_USER_CFLAGS -DHB_FM_STATISTICS_OFF" +export HB_USER_CFLAGS="$CC_HB_USER_CFLAGS" export CC_HB_USER_PRGFLAGS="-D__PLATFORM__WINDOWS -undef:__PLATFORM__UNIX -undef:__PLATFORM__LINUX" export HB_USER_PRGFLAGS="$CC_HB_USER_PRGFLAGS" export HB_USER_LDFLAGS="${CC_HB_USER_LDFLAGS}" @@ -308,8 +308,6 @@ rm -fR $RPM_BUILD_ROOT %{_libdir}/%{name}/libhbcommon.a %{_libdir}/%{name}/libhbcplr.a %{_libdir}/%{name}/libhbdebug.a -%{_libdir}/%{name}/libhbfm.a -%{_libdir}/%{name}/libhbfmmt.a %{_libdir}/%{name}/librddfpt.a %{_libdir}/%{name}/librddcdx.a %{_libdir}/%{name}/librddntx.a diff --git a/harbour/harbour.spec b/harbour/harbour.spec index f128a0add2..8ddd646011 100644 --- a/harbour/harbour.spec +++ b/harbour/harbour.spec @@ -71,7 +71,7 @@ %define hb_pref hb %define hb_arch export HB_ARCHITECTURE=linux %define hb_cc export HB_COMPILER=gcc -%define hb_cflag export HB_USER_CFLAGS="-DHB_FM_STATISTICS_OFF" +%define hb_cflag export HB_USER_CFLAGS= %define hb_lflag export HB_USER_LDFLAGS="${CC_HB_USER_LDFLAGS} %{?_with_static:-static}" %define hb_gpm export HB_GPM_MOUSE=%{!?_without_gpm:yes} %define hb_crs export HB_WITHOUT_GTCRS=%{?_without_gtcrs:yes} @@ -629,8 +629,6 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/%{name}/libhbcommon.a %{_libdir}/%{name}/libhbcplr.a %{_libdir}/%{name}/libhbdebug.a -%{_libdir}/%{name}/libhbfm.a -%{_libdir}/%{name}/libhbfmmt.a %{_libdir}/%{name}/librddfpt.a %{_libdir}/%{name}/librddcdx.a %{_libdir}/%{name}/librddntx.a diff --git a/harbour/include/hbsetup.h b/harbour/include/hbsetup.h index 4632ce8bc6..fbcba540ea 100644 --- a/harbour/include/hbsetup.h +++ b/harbour/include/hbsetup.h @@ -88,24 +88,6 @@ #define HB_CODEPAGE_DEFAULT EN #endif -/* *********************************************************************** - * If you turn this on, the memory subsystem will collect trace information - * and several statistical data about memory management, it will show - * these on exit if memory seem to have been leaked. The memory subsystem - * will also do pointer checks. [vszakats] - * This should be normally turned off in a final release. - * - * Note that if you turn this on, Harbour will be slighlty slower, larger - * and will consume more memory. - * - * By default this is turned on. Define HB_FM_STATISTICS_OFF to turn it off. - */ -#if defined( HB_FM_STATISTICS_OFF ) - #undef HB_FM_STATISTICS -#elif !defined( HB_FM_STATISTICS ) - #define HB_FM_STATISTICS -#endif - /* *********************************************************************** * Enable profiler support in HVM * By default this is turned off. Define HB_USE_PROFILER to turn it on. diff --git a/harbour/mpkg_tgz.sh b/harbour/mpkg_tgz.sh index 5ff6d3378b..2fa100037f 100755 --- a/harbour/mpkg_tgz.sh +++ b/harbour/mpkg_tgz.sh @@ -29,7 +29,6 @@ hb_pref="hb" hb_contrib="" hb_sysdir="yes" hb_exesuf="" -export HB_USER_CFLAGS="$HB_USER_CFLAGS -DHB_FM_STATISTICS_OFF" [ -z "$HB_INSTALL_PREFIX" ] && [ -n "$PREFIX" ] && export HB_INSTALL_PREFIX="$PREFIX" diff --git a/harbour/mpkg_win.bat b/harbour/mpkg_win.bat index 8c45f5db90..5dd510082c 100644 --- a/harbour/mpkg_win.bat +++ b/harbour/mpkg_win.bat @@ -47,7 +47,6 @@ set HB_BUILD_DLL=yes set HB_BUILD_OPTIM=yes set HB_BUILD_DEBUG=no set HB_BUILD_IMPLIB=no -set HB_USER_CFLAGS=%HB_USER_CFLAGS% -DHB_FM_STATISTICS_OFF rem ; Build Harbour call make_gnu.bat diff --git a/harbour/source/vm/Makefile b/harbour/source/vm/Makefile index db42c298f5..56f5a6b3d8 100644 --- a/harbour/source/vm/Makefile +++ b/harbour/source/vm/Makefile @@ -4,6 +4,26 @@ ROOT = ../../ +HB_HVM_ALL = yes +ifeq ($(HB_COMPILER),bcc) + HB_HVM_ALL = no +endif +ifeq ($(HB_COMPILER),pocc) + HB_HVM_ALL = no +endif +ifeq ($(HB_COMPILER),pocc64) + HB_HVM_ALL = no +endif +ifeq ($(HB_COMPILER),poccarm) + HB_HVM_ALL = no +endif +ifeq ($(HB_COMPILER),xcc) + HB_HVM_ALL = no +endif +ifeq ($(HB_COMPILER),dmc) + HB_HVM_ALL = no +endif + ifeq ($(HB_ARCHITECTURE),win) ifeq ($(HB_COMPILER),mingw) C_MAIN = mainwin.c @@ -76,12 +96,10 @@ PRG_SOURCES=\ LIBNAME=hbvm -DIRS+= fm - HB_USER_CFLAGS:=$(subst -DHB_MT_VM,,$(HB_USER_CFLAGS)) ifneq ($(HB_ARCHITECTURE),dos) ifneq ($(HB_MT),no) - DIRS+= vmmt fmmt + DIRS+= vmmt endif endif diff --git a/harbour/source/vm/fm.c b/harbour/source/vm/fm.c index d8de59a951..c90f85eea2 100644 --- a/harbour/source/vm/fm.c +++ b/harbour/source/vm/fm.c @@ -63,6 +63,12 @@ /* NOTE: This definitions must be ahead of any and all #include statements */ +#if !defined( HB_FM_STATISTICS ) + !defined( HB_FM_STATISTICS_OFF ) + !defined( HB_FM_STATISTICS_DYN_OFF ) + #define HB_FM_STATISTICS_OFF +#endif + /* For MS-Win builds */ #define HB_OS_WIN_USED diff --git a/harbour/source/vm/fm/Makefile b/harbour/source/vm/fm/Makefile deleted file mode 100644 index 2e20ba66b0..0000000000 --- a/harbour/source/vm/fm/Makefile +++ /dev/null @@ -1,19 +0,0 @@ -# -# $Id$ -# - -vpath %.c ../ - -ROOT = ../../../ - -C_SOURCES=\ - fm.c \ - -LIBNAME=hbfm - -HB_USER_CFLAGS :=$(subst -DHB_MT_VM,,$(HB_USER_CFLAGS)) -HB_USER_CFLAGS :=$(subst -DHB_FM_STATISTICS_OFF,,$(HB_USER_CFLAGS)) -HB_USER_CFLAGS :=$(subst -DHB_FM_STATISTICS_DYN_OFF,,$(HB_USER_CFLAGS)) -HB_USER_CFLAGS += -DHB_FM_STATISTICS - -include $(TOP)$(ROOT)config/lib.cf diff --git a/harbour/source/vm/fmmt/Makefile b/harbour/source/vm/fmmt/Makefile deleted file mode 100644 index f3f9d959d5..0000000000 --- a/harbour/source/vm/fmmt/Makefile +++ /dev/null @@ -1,18 +0,0 @@ -# -# $Id$ -# - -vpath %.c ../ - -ROOT = ../../../ - -C_SOURCES=\ - fm.c \ - -LIBNAME=hbfmmt - -HB_USER_CFLAGS :=$(subst -DHB_FM_STATISTICS_OFF,,$(HB_USER_CFLAGS)) -HB_USER_CFLAGS :=$(subst -DHB_FM_STATISTICS_DYN_OFF,,$(HB_USER_CFLAGS)) -HB_USER_CFLAGS += -DHB_FM_STATISTICS -DHB_MT_VM - -include $(TOP)$(ROOT)config/lib.cf diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg index d181f99f6f..ff0cd19aee 100644 --- a/harbour/utils/hbmk2/hbmk2.prg +++ b/harbour/utils/hbmk2/hbmk2.prg @@ -254,7 +254,6 @@ FUNCTION hbmk( aArgs ) LOCAL s_aLIBVM LOCAL s_aLIBUSER LOCAL s_aLIBUSERGT - LOCAL s_aLIBFM LOCAL s_aLIBHB LOCAL s_aLIBHBGT LOCAL s_aLIB3RD @@ -295,7 +294,6 @@ FUNCTION hbmk( aArgs ) LOCAL s_lBLDFLGC := .F. LOCAL s_lBLDFLGL := .F. LOCAL s_lRUN := .F. - LOCAL s_lFMSTAT := NIL /* NIL = default, .T. = on, .F. = off */ LOCAL s_lINC := .F. LOCAL s_lREBUILD := .F. LOCAL s_lCLEAN := .F. @@ -790,7 +788,6 @@ FUNCTION hbmk( aArgs ) s_aOPTRUN := {} s_aRESSRC := {} s_aRESCMP := {} - s_aLIBFM := {} s_aLIBUSER := {} s_aLIBUSERGT := {} s_aLIBDYNHAS := {} @@ -928,9 +925,6 @@ FUNCTION hbmk( aArgs ) CASE cParamL == "-inc" ; s_lINC := .T. CASE cParamL == "-inc-" .OR. ; cParamL == "-noinc" ; s_lINC := .F. - CASE cParamL == "-fmstat" ; s_lFMSTAT := .T. - CASE cParamL == "-fmstat-" .OR. ; - cParamL == "-nofmstat" ; s_lFMSTAT := .F. CASE cParamL == "-strip" ; s_lSTRIP := .T. CASE cParamL == "-strip-" .OR. ; cParamL == "-nostrip" ; s_lSTRIP := .F. @@ -1591,10 +1585,6 @@ FUNCTION hbmk( aArgs ) AAdd( s_aLIBSYS, "X11" ) ENDIF - IF s_lFMSTAT != NIL .AND. s_lFMSTAT - AAdd( s_aLIBFM, iif( s_lMT, "hbfmmt", "hbfm" ) ) - ENDIF - CASE ( s_cARCH == "win" .AND. s_cCOMP == "gcc" ) .OR. ; ( s_cARCH == "win" .AND. s_cCOMP == "mingw" ) .OR. ; ( s_cARCH == "win" .AND. s_cCOMP == "mingw64" ) .OR. ; @@ -1686,10 +1676,6 @@ FUNCTION hbmk( aArgs ) s_aLIBSHAREDPOST := { "hbmainstd", "hbmainwin" } - IF s_lFMSTAT != NIL .AND. s_lFMSTAT - AAdd( s_aLIBFM, iif( s_lMT, "hbfmmt", "hbfm" ) ) - ENDIF - IF s_cCOMP $ "mingw|mingw64|mingwarm" .AND. Len( s_aRESSRC ) > 0 cBin_Res := s_cCCPREFIX + "windres" cResExt := ".reso" @@ -1746,10 +1732,6 @@ FUNCTION hbmk( aArgs ) AAdd( s_aOPTL, "-o {OE}" ) ENDIF - IF s_lFMSTAT != NIL .AND. s_lFMSTAT - AAdd( s_aLIBFM, iif( s_lMT, "hbfmmt", "hbfm" ) ) - ENDIF - CASE s_cARCH == "dos" .AND. s_cCOMP == "djgpp" IF s_lDEBUG @@ -1794,10 +1776,6 @@ FUNCTION hbmk( aArgs ) AAdd( s_aOPTL, "-o{OE}" ) ENDIF - IF s_lFMSTAT != NIL .AND. s_lFMSTAT - AAdd( s_aLIBFM, "hbfm" ) - ENDIF - /* Watcom family */ CASE s_cARCH == "dos" .AND. s_cCOMP == "owatcom" cLibPrefix := "LIB " @@ -1911,10 +1889,6 @@ FUNCTION hbmk( aArgs ) cResPrefix := "OP res=" ENDIF - IF s_lFMSTAT != NIL .AND. s_lFMSTAT - AAdd( s_aLIBFM, iif( s_lMT, "hbfmmt", "hbfm" ) ) - ENDIF - CASE s_cARCH == "os2" .AND. s_cCOMP == "owatcom" cLibPrefix := "LIB " cLibExt := ".lib" @@ -1960,10 +1934,6 @@ FUNCTION hbmk( aArgs ) AAdd( s_aOPTL, "OP MAP" ) ENDIF - IF s_lFMSTAT != NIL .AND. s_lFMSTAT - AAdd( s_aLIBFM, iif( s_lMT, "hbfmmt", "hbfm" ) ) - ENDIF - CASE s_cARCH == "linux" .AND. s_cCOMP == "owatcom" cLibPrefix := "LIB " cLibExt := ".lib" @@ -2009,10 +1979,6 @@ FUNCTION hbmk( aArgs ) AAdd( s_aOPTL, "OP MAP" ) ENDIF - IF s_lFMSTAT != NIL .AND. s_lFMSTAT - AAdd( s_aLIBFM, iif( s_lMT, "hbfmmt", "hbfm" ) ) - ENDIF - /* Misc */ CASE s_cARCH == "win" .AND. s_cCOMP == "bcc" IF s_lDEBUG @@ -2076,10 +2042,6 @@ FUNCTION hbmk( aArgs ) "harbour-" + cDL_Version_Alter + "-bcc" + cLibExt ) } s_aLIBSHAREDPOST := { "hbmainstd", "hbmainwin" } - IF s_lFMSTAT != NIL .AND. s_lFMSTAT - AAdd( s_aLIBFM, iif( s_lMT, "hbfmmt", "hbfm" ) ) - ENDIF - CASE ( s_cARCH == "win" .AND. s_cCOMP $ "msvc|msvc64|msvcia64|icc|iccia64" ) .OR. ; ( s_cARCH == "wce" .AND. s_cCOMP == "msvcarm" ) /* NOTE: Cross-platform: wce/ARM on win/x86 */ IF s_lDEBUG @@ -2214,10 +2176,6 @@ FUNCTION hbmk( aArgs ) cResExt := ".res" ENDIF - IF s_lFMSTAT != NIL .AND. s_lFMSTAT - AAdd( s_aLIBFM, iif( s_lMT, "hbfmmt", "hbfm" ) ) - ENDIF - CASE ( s_cARCH == "win" .AND. s_cCOMP == "pocc" ) .OR. ; ( s_cARCH == "win" .AND. s_cCOMP == "pocc64" ) .OR. ; /* NOTE: Cross-platform: win/amd64 on win/x86 */ ( s_cARCH == "wce" .AND. s_cCOMP == "poccarm" ) .OR. ; /* NOTE: Cross-platform: wce/ARM on win/x86 */ @@ -2300,10 +2258,6 @@ FUNCTION hbmk( aArgs ) s_aLIBSHAREDPOST := { "hbmainstd", "hbmainwin" } - IF s_lFMSTAT != NIL .AND. s_lFMSTAT - AAdd( s_aLIBFM, iif( s_lMT, "hbfmmt", "hbfm" ) ) - ENDIF - /* TODO */ CASE s_cARCH == "linux" .AND. s_cCOMP == "icc" ENDCASE @@ -2326,8 +2280,7 @@ FUNCTION hbmk( aArgs ) ! s_lCLEAN .AND. ; ( s_cMAIN != NIL .OR. ; ! Empty( s_aLIBUSERGT ) .OR. ; - s_cGT != NIL .OR. ; - s_lFMSTAT != NIL ) + s_cGT != NIL ) fhnd := hb_FTempCreateEx( @s_cCSTUB, NIL, "hbmk_", ".c" ) IF fhnd != F_ERROR @@ -2354,9 +2307,6 @@ FUNCTION hbmk( aArgs ) than starting with the wrong (default) function. */ AAdd( array, Upper( iif( Left( s_cMAIN, 1 ) == "@", SubStr( s_cMAIN, 2 ), s_cMAIN ) ) ) ENDIF - IF s_lFMSTAT != NIL - AAdd( array, iif( s_lFMSTAT, "HB_FM_STAT", "HB_FM_NOSTAT" ) ) - ENDIF IF s_cGT != NIL /* Always request default GT first */ AAdd( array, "HB_GT_" + Upper( SubStr( s_cGT, 3 ) ) ) @@ -2424,12 +2374,10 @@ FUNCTION hbmk( aArgs ) /* Library list assembly */ IF s_lSHARED .AND. ! Empty( s_aLIBSHARED ) s_aLIBHB := ArrayAJoin( { s_aLIBSHAREDPOST,; - s_aLIBFM,; aLIB_BASE_CPLR,; aLIB_BASE_DEBUG } ) ELSE - s_aLIBHB := ArrayAJoin( { s_aLIBFM,; - aLIB_BASE1,; + s_aLIBHB := ArrayAJoin( { aLIB_BASE1,; aLIB_BASE_CPLR,; aLIB_BASE_DEBUG,; s_aLIBVM,; @@ -4625,7 +4573,6 @@ STATIC PROCEDURE ShowHelp( lLong ) " -[no]opt toggle C compiler optimizations (default: on)" ,; " -[no]map create (or not) a map file" ,; " -[no]strip strip (no strip) binaries" ,; - " -[no]fmstat enable/disable runtime memory statistics (gcc builds only)" ,; " -[no]trace show commands executed" ,; " -traceonly show commands to be executed, but don't execute them" ,; " -[no]compr[=lev] compress executable/dynamic lib (needs UPX)" ,;