From e6d1ef70c23b55ec76bbbb1e2e357560d87154fc Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Fri, 3 Apr 2009 09:06:10 +0000 Subject: [PATCH] 2009-04-03 11:05 UTC+0200 Viktor Szakats (harbour.01 syenar hu) * bin/hb-mkdyn.bat ! Attempt to fix owatcom shared executable generation. (still GPFs, or does nothing) * utils/hbmk2/hbmk2.prg ! Fixed typo in prev commit, causing RTE. --- harbour/ChangeLog | 8 ++++++++ harbour/bin/hb-mkdyn.bat | 4 ++-- harbour/utils/hbmk2/hbmk2.prg | 2 +- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 7be24c5b9d..320e6274cd 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,14 @@ 2009-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org) */ +2009-04-03 11:05 UTC+0200 Viktor Szakats (harbour.01 syenar hu) + * bin/hb-mkdyn.bat + ! Attempt to fix owatcom shared executable generation. + (still GPFs, or does nothing) + + * utils/hbmk2/hbmk2.prg + ! Fixed typo in prev commit, causing RTE. + 2009-04-03 03:45 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl) * harbour/source/rtl/dircmd.prg ! small fix in 'DIR ' DOS like output formatting. diff --git a/harbour/bin/hb-mkdyn.bat b/harbour/bin/hb-mkdyn.bat index 59b0ed6160..31584b2be2 100644 --- a/harbour/bin/hb-mkdyn.bat +++ b/harbour/bin/hb-mkdyn.bat @@ -301,8 +301,8 @@ for %%f in (%HB_DLL_LIBS% %HB_DLL_LIBS_WIN%) do ( echo FILE '%HB_LIB_INSTALL%\%%f.lib'>> _hbsmt.txt ) -copy /b /y "%HB_LIB_INSTALL%\%HB_DLL_LIBS_ST%.lib" . > nul && wlib -q -b "%HB_DLL_LIBS_ST%.lib" - mainwin.obj -copy /b /y "%HB_LIB_INSTALL%\%HB_DLL_LIBS_MT%.lib" . > nul && wlib -q -b "%HB_DLL_LIBS_MT%.lib" - mainwin.obj +copy /b /y "%HB_LIB_INSTALL%\%HB_DLL_LIBS_ST%.lib" . > nul && wlib -q -b "%HB_DLL_LIBS_ST%.lib" - mainwin.obj - mainstd.obj +copy /b /y "%HB_LIB_INSTALL%\%HB_DLL_LIBS_MT%.lib" . > nul && wlib -q -b "%HB_DLL_LIBS_MT%.lib" - mainwin.obj - mainstd.obj echo FILE '%HB_DLL_LIBS_ST%.lib'>> _hbsst.txt echo FILE '%HB_DLL_LIBS_MT%.lib'>> _hbsmt.txt diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg index cef0f40585..5072c24623 100644 --- a/harbour/utils/hbmk2/hbmk2.prg +++ b/harbour/utils/hbmk2/hbmk2.prg @@ -1095,7 +1095,7 @@ FUNCTION Main( ... ) aCommand := ArrayAJoin( { { iif( lCreateLib .OR. lCreateDyn, "-n1", "-n2" ) },; s_aPRG,; { "-i" + s_cHB_INC_INSTALL },; - iif( s_lBLDFLGP, { " " + cSelfFlagPRG }, {} ) +; + iif( s_lBLDFLGP, { " " + cSelfFlagPRG }, {} ),; ListToArray( iif( ! Empty( GetEnv( "HB_USER_PRGFLAGS" ) ), " " + GetEnv( "HB_USER_PRGFLAGS" ), "" ) ),; s_aOPTPRG } )