From f3caf5ad7e5341a1dc45aadfe921683bac9dd7dc Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Sat, 13 Mar 2010 18:48:14 +0000 Subject: [PATCH] 2010-03-13 19:47 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) * utils/hbmk2/hbmk2.prg ! Fixed autodetection of mingwarm, when Cygwin is also in PATH (it is supposed to be there, as it is a requirement for C compiler). --- harbour/ChangeLog | 6 ++++++ harbour/utils/hbmk2/hbmk2.prg | 6 +++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 1e42c5db80..84b3604e91 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -17,6 +17,12 @@ past entries belonging to author(s): Viktor Szakats. */ +2010-03-13 19:47 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) + * utils/hbmk2/hbmk2.prg + ! Fixed autodetection of mingwarm, when Cygwin is also + in PATH (it is supposed to be there, as it is a + requirement for C compiler). + 2010-03-13 17:20 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) * utils/hbmk2/hbmk2.prg + hbmainstd/hbmainwin lib is now added for mingw family diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg index a2ad8a59c8..401104280f 100644 --- a/harbour/utils/hbmk2/hbmk2.prg +++ b/harbour/utils/hbmk2/hbmk2.prg @@ -1116,13 +1116,13 @@ FUNCTION hbmk2( aArgs, /* @ */ lPause ) l_aLIBSYSMISC := { "winspool", "comctl32", "comdlg32", "shell32", "uuid", "ole32", "oleaut32", "mpr", "winmm", "mapi32", "imm32", "msimg32", "wininet" } CASE hbmk[ _HBMK_cPLAT ] == "wce" #if ! defined( __PLATFORM__UNIX ) - aCOMPDET := { { {|| FindInPath( hbmk[ _HBMK_cCCPREFIX ] + "gcc" + hbmk[ _HBMK_cCCPOSTFIX ] ) }, "mingwarm" },; - { {|| FindInPath( "clarm" ) }, "msvcarm" },; + aCOMPDET := { { {|| FindInPath( "clarm" ) }, "msvcarm" },; { {|| FindInPath( "armasm" ) }, "msvcarm" },; { {|| FindInPath( "pocc" ) }, "poccarm" },; { {|| FindInPath( "arm-mingw32ce-gcc" ) }, "mingwarm", "arm-mingw32ce-" } ,; { {|| FindInPath( "arm-wince-mingw32ce-gcc" ) }, "mingwarm", "arm-wince-mingw32ce-" } ,; - { {|| FindInPath( "i386-mingw32ce-gcc" ) }, "mingw" , "i386-mingw32ce-" } } + { {|| FindInPath( "i386-mingw32ce-gcc" ) }, "mingw" , "i386-mingw32ce-" } ,; + { {|| FindInPath( hbmk[ _HBMK_cCCPREFIX ] + "gcc" + hbmk[ _HBMK_cCCPOSTFIX ] ) }, "mingwarm" } } #endif aCOMPSUP := { "mingwarm", "msvcarm", "poccarm" } l_aLIBHBGT := { "gtwvt", "gtgui" }