diff --git a/harbour/ChangeLog b/harbour/ChangeLog index fef4948442..b268e5ef88 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,16 @@ 2009-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org) */ +2009-02-28 09:56 UTC+0100 Viktor Szakats (harbour.01 syenar hu) + * utils/hbmk2/hbmk2.prg + ! Fixed yesterday's -fullstatic patch. Now it should work. + + * make_b32.bat + * make_vc.bat + - Disabled automatic .dll builds to expose the + pure make_gnu.bat interface. + * Some refininements to vc version. + 2009-02-28 01:22 UTC+0100 Viktor Szakats (harbour.01 syenar hu) * INSTALL + Added win/owatcom. diff --git a/harbour/make_b32.bat b/harbour/make_b32.bat index 23b8a94da6..d7cad0fda2 100644 --- a/harbour/make_b32.bat +++ b/harbour/make_b32.bat @@ -17,10 +17,12 @@ rem --------------------------------------------------------------- set HB_COMPILER=bcc32 if "%HB_INSTALL_PREFIX%" == "" set HB_INSTALL_PREFIX=%~dp0 -if "%HB_BUILD_DLL%" == "" set HB_BUILD_DLL=yes set _HB_CC_NAME=%HB_CC_NAME% if "%_HB_CC_NAME%" == "" set _HB_CC_NAME=b32 +rem ; NOTE: For complete compatibility please uncomment line below: +rem if "%HB_BUILD_DLL%" == "" set HB_BUILD_DLL=yes + call make_gnu.bat > make_%_HB_CC_NAME%.log set _HB_CC_NAME= diff --git a/harbour/make_vc.bat b/harbour/make_vc.bat index 9d26c3d95f..0952492f00 100644 --- a/harbour/make_vc.bat +++ b/harbour/make_vc.bat @@ -14,11 +14,14 @@ rem --------------------------------------------------------------- @echo off +if "%HB_BUILD_WINCE%" == "yes" set HB_COMPILER=msvcce + if "%HB_INSTALL_PREFIX%" == "" set HB_INSTALL_PREFIX=%~dp0 -if "%HB_BUILD_DLL%" == "" set HB_BUILD_DLL=yes set _HB_CC_NAME=%HB_CC_NAME% -if "%HB_BUILD_WINCE%" == "yes" if "%_HB_CC_NAME%" == "" set _HB_CC_NAME=vcce -if not "%HB_BUILD_WINCE%" == "yes" if "%_HB_CC_NAME%" == "" set _HB_CC_NAME=vc +if "%_HB_CC_NAME%" == "" set _HB_CC_NAME=vc + +rem ; NOTE: For complete compatibility please uncomment line below: +rem if "%HB_BUILD_DLL%" == "" set HB_BUILD_DLL=yes call make_gnu.bat > make_%_HB_CC_NAME%.log diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg index cd3da83448..41408b4e6f 100644 --- a/harbour/utils/hbmk2/hbmk2.prg +++ b/harbour/utils/hbmk2/hbmk2.prg @@ -1028,7 +1028,7 @@ FUNCTION Main( ... ) cOpt_CompC += " -Wl,-Map {OM}" ENDIF IF s_lSTATICFULL - cOpt_CompC += " -Wl,-static" + cOpt_CompC += " -static" ENDIF IF t_cARCH == "darwin" AAdd( s_aOPTC, "-no-cpp-precomp" )