From 73580cbc663913609737d74273f62eaa38fce576 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Sun, 6 Sep 2009 01:58:03 +0000 Subject: [PATCH] 2009-09-06 03:57 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * utils/hbmk2/hbmk2.prg ! Further adjusted rdd lib ordering to make some linkers (mingw) happy without using lib grouping. Applied also for xhb mode. --- harbour/ChangeLog | 5 +++++ harbour/utils/hbmk2/hbmk2.prg | 8 ++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index f83cd98b51..f665784c8f 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -17,6 +17,11 @@ past entries belonging to author(s): Viktor Szakats. */ +2009-09-06 03:57 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) + * utils/hbmk2/hbmk2.prg + ! Further adjusted rdd lib ordering to make some linkers (mingw) + happy without using lib grouping. Applied also for xhb mode. + 2009-09-06 03:21 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * utils/hbmk2/hbmk2.prg ! Typo in recent addition (-compiler/-platform options) diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg index aa9e5dff7f..47a1d6bc5f 100644 --- a/harbour/utils/hbmk2/hbmk2.prg +++ b/harbour/utils/hbmk2/hbmk2.prg @@ -754,9 +754,9 @@ FUNCTION hbmk( aArgs, /* @ */ lPause, /* @ */ lUTF8 ) aLIB_BASE_GT := { "gtcgi", "gtpca", "gtstd" } aLIB_BASE_NULRDD := { "hbnulrdd" } IF hbmk[ _HBMK_nHBMODE ] == _HBMODE_HB10 - aLIB_BASE_RDD := { "hbusrrdd", "rddntx", "rddcdx", "rddfpt", "hbrdd", "hbhsx", "hbsix" } + aLIB_BASE_RDD := { "hbrdd", "hbusrrdd", "rddntx", "rddcdx", "rddfpt", "hbrdd", "hbhsx", "hbsix" } ELSE - aLIB_BASE_RDD := { "hbuddall", "hbusrrdd", "rddntx", "rddcdx", "rddnsx", "rddfpt", "hbrdd", "hbhsx", "hbsix" } + aLIB_BASE_RDD := { "hbrdd", "hbuddall", "hbusrrdd", "rddntx", "rddcdx", "rddnsx", "rddfpt", "hbrdd", "hbhsx", "hbsix" } ENDIF aLIB_BASE_RDD_MT := aLIB_BASE_RDD aLIB_BASE_CPLR := { "hbcplr" } @@ -777,8 +777,8 @@ FUNCTION hbmk( aArgs, /* @ */ lPause, /* @ */ lUTF8 ) aLIB_BASE_2_MT := { "rtlmt", "vmmt" } aLIB_BASE_GT := { "gtcgi", "gtpca", "gtstd" } aLIB_BASE_NULRDD := { "nulsys" } - aLIB_BASE_RDD := { "rdd" , "usrrdd" , "rdds" , "hsx" , "hbsix" , "dbfntx" , "dbfcdx" , "dbffpt" } - aLIB_BASE_RDD_MT := { "rddmt", "usrrddmt", "rddsmt", "hsxmt", "hbsixmt", "dbfntxmt", "dbfcdxmt", "dbffptmt" } + aLIB_BASE_RDD := { "rdd" , "usrrdd" , "rdds" , "dbfntx" , "dbfcdx" , "dbffpt" , "rdd" , "hsx" , "hbsix" } + aLIB_BASE_RDD_MT := { "rddmt", "usrrddmt", "rddsmt", "dbfntxmt", "dbfcdxmt", "dbffptmt", "rddmt", "hsxmt", "hbsixmt" } aLIB_BASE_CPLR := {} aLIB_BASE_3 := { "macro" , "pp" , "common" } aLIB_BASE_3_MT := { "macromt", "ppmt", "common" }