From c37c1a75abe2dd68cdd6b5f18254c92f0deed42f Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Mon, 18 Apr 2011 07:33:41 +0000 Subject: [PATCH] 2011-04-18 09:33 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * utils/hbmk2/hbmk2.prg * INSTALL + Added autodetection of mingwarm compilers under win hosts. --- harbour/ChangeLog | 5 +++++ harbour/INSTALL | 4 ---- harbour/utils/hbmk2/hbmk2.prg | 4 +++- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 1869593804..70d97c2b6a 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,11 @@ The license applies to all entries newer than 2009-04-28. */ +2011-04-18 09:33 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) + * utils/hbmk2/hbmk2.prg + * INSTALL + + Added autodetection of mingwarm compilers under win hosts. + 2011-04-18 00:13 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * contrib/hblzf/core.c ! Fixed AVOID_ERRNO usage. diff --git a/harbour/INSTALL b/harbour/INSTALL index 04c58a2121..4ecb309ed7 100644 --- a/harbour/INSTALL +++ b/harbour/INSTALL @@ -222,10 +222,6 @@ HARBOUR cd contrib/ ..\..\bin\\\hbmk2 ..\make.hbs [clean] [install] [custom hbmk2 options] - KNOWN ISSUE: Some targets (notably wce) has to be manually configured in this - scenario, since the autodetection results of core build is not - available here, and hbmk2 misses some of the autodetection cases. - 3. HOW TO CREATE DISTRIBUTABLE PACKAGES diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg index 019f7703fc..0d80215b11 100644 --- a/harbour/utils/hbmk2/hbmk2.prg +++ b/harbour/utils/hbmk2/hbmk2.prg @@ -1392,7 +1392,9 @@ FUNCTION hbmk2( aArgs, nArgTarget, /* @ */ lPause, nLevel ) /* Order is significant. watcom also keeps a cl.exe in its binary dir. */ #if ! defined( __PLATFORM__UNIX ) - aCOMPDET := { { {|| FindInSamePath( "cygstart.exe", "gcc" ) }, "gcc",,, "cygwin" },; + aCOMPDET := { { {|| FindInPath( "arm-mingw32ce-gcc" ) }, "mingwarm", "arm-mingw32ce-",, "wce" } ,; + { {|| FindInPath( "arm-wince-mingw32ce-gcc" ) }, "mingwarm", "arm-wince-mingw32ce-",, "wce" } ,; + { {|| FindInSamePath( "cygstart.exe", "gcc" ) }, "gcc",,, "cygwin" },; { {|| FindInPath( "gcc-dw2" ) }, "mingw", "", "-dw2" },; /* tdragon DWARF-2 build */ { {|| FindInPath( "x86_64-pc-mingw32-gcc" ) }, "mingw64" },; /* Equation Solution build */ { {|| FindInPath( hbmk[ _HBMK_cCCPREFIX ] + "gcc" + hbmk[ _HBMK_cCCPOSTFIX ] ) }, "mingw" },;