From 78c78aa2d66f4cd046a740df6b4602dd620c087a Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Tue, 24 Feb 2009 09:20:30 +0000 Subject: [PATCH] 2009-02-24 10:20 UTC+0100 Viktor Szakats (harbour.01 syenar hu) * ChangeLog * Updates. ! Correction made to entry: 2009-02-24 01:30 UTC+0100 Viktor Szakats (harbour.01 syenar hu) * utils/hbmk2/hbmk2.prg * Attempt to add .dll support for win/owatcom. ; TOFIX: This happens: Warning! W1023: no starting address found, using 00401000 --- harbour/ChangeLog | 16 ++++++++++++++-- harbour/utils/hbmk2/hbmk2.prg | 7 +++++++ 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 00a2437c4e..d584c63faf 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,17 @@ 2009-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org) */ +2009-02-24 10:20 UTC+0100 Viktor Szakats (harbour.01 syenar hu) + * ChangeLog + * Updates. + ! Correction made to entry: + 2009-02-24 01:30 UTC+0100 Viktor Szakats (harbour.01 syenar hu) + + * utils/hbmk2/hbmk2.prg + * Attempt to add .dll support for win/owatcom. + ; TOFIX: This happens: + Warning! W1023: no starting address found, using 00401000 + 2009-02-24 02:13 UTC+0100 Viktor Szakats (harbour.01 syenar hu) * bin/hb-mkdyn.bat + Added Open Watcom .dll building. @@ -16,8 +27,9 @@ 2009-02-24 01:30 UTC+0100 Viktor Szakats (harbour.01 syenar hu) * utils/hbmk2/hbmk2.prg ! Tweaked to only include path in shared lib name on *nixes, - if Harbour is installed in a system location. + if Harbour is installed on a system location. ! Forgot to add bin dir to lib path in shared mode in gcc/*nix. + (correction: this wasn't needed, and wasn't finally committed) ! Fixed macro substitution order for {DB}. ! Tweaks for library name forming on gcc family. The applied rule is to prepend -l, delete lib prefix and extension, @@ -6382,7 +6394,7 @@ * MemoRead() -> hb_MemoRead() * contrib/hbct/files.c - ; TOFIX: Many functions here are possibly not thread safe. + ; TOFIX: Many functions here are possibly not thread safe. [DONE] ; TOFIX: Calling hb_fsFindClose() at app exit (and thus keeping the FF handles open for the whole app lifetime) doesn't play well with server side apps (as the app may run for diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg index 03f2fa9e6c..c2eff69c30 100644 --- a/harbour/utils/hbmk2/hbmk2.prg +++ b/harbour/utils/hbmk2/hbmk2.prg @@ -1163,6 +1163,13 @@ FUNCTION Main( ... ) AAdd( s_aOPTL, "OP MAP" ) ENDIF s_aLIBSYS := ArrayJoin( s_aLIBSYS, { "kernel32", "user32", "wsock32" } ) + /* TOFIX: The two build systems should generate the same .dll name, otherwise + we can only be compatible with one of them. non-GNU is the common choice here. */ + s_aLIBSHARED := { iif( s_lMT, "harbourmt-" + cDL_Version_NonGNU + "-ow",; + "harbour-" + cDL_Version_NonGNU + "-ow" ),; + "hbmainstd",; + "hbmainwin",; + "hbcommon" } IF Len( s_aRESSRC ) > 0 IF Len( s_aRESSRC ) == 1