From 59ff7cb487bbd1afe640affb8c670c928ee567b1 Mon Sep 17 00:00:00 2001
From: Viktor Szakats <harbour@syenar.net>
Date: Fri, 8 Jul 2011 10:57:04 +0000
Subject: [PATCH] 2011-07-08 12:56 UTC+0200 Viktor Szakats (harbour.01
 syenar.hu)   * utils/hbmk2/hbmk2.prg   * config/global.mk     + mingw64-tdm
 autodetection.       PLEASE TEST!

---
 harbour/ChangeLog             |  6 +++++
 harbour/config/global.mk      | 48 ++++++++++++++++++++++-------------
 harbour/utils/hbmk2/hbmk2.prg |  1 +
 3 files changed, 37 insertions(+), 18 deletions(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 4c8298cd46..b41e7a5cc7 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,12 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2011-07-08 12:56 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * utils/hbmk2/hbmk2.prg
+  * config/global.mk
+    + mingw64-tdm autodetection.
+      PLEASE TEST!
+
 2011-07-08 12:55 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * utils/hbmk2/hbmk2.prg
   * config/global.mk
diff --git a/harbour/config/global.mk b/harbour/config/global.mk
index 19ad68f4f5..9384e98d71 100644
--- a/harbour/config/global.mk
+++ b/harbour/config/global.mk
@@ -609,25 +609,37 @@ ifeq ($(HB_COMPILER),)
                         else
                            HB_COMP_PATH := $(call find_in_path,gcc)
                            ifneq ($(HB_COMP_PATH),)
-                              HB_COMPILER := mingw
-                              ifneq ($(wildcard $(dir $(HB_COMP_PATH))mingw32-gcc-4.6*),)
-                                 HB_COMPILER_VER := 46
+                              # Check for a mingw64-tdm gcc executable in the same directory
+                              ifneq ($(wildcard $(dir $(HB_COMP_PATH))x86_64-w64-mingw32-gcc$(HB_HOST_BIN_EXT)),)
+                                 HB_COMPILER := mingw64
+                                 ifneq ($(wildcard $(dir $(HB_COMP_PATH))x86_64-w64-mingw32-gcc-4.6*),)
+                                    HB_COMPILER_VER := 46
+                                 else
+                                 ifneq ($(wildcard $(dir $(HB_COMP_PATH))x86_64-w64-mingw32-gcc-4.5*),)
+                                    HB_COMPILER_VER := 45
+                                 endif
+                                 endif
                               else
-                              ifneq ($(wildcard $(dir $(HB_COMP_PATH))mingw32-gcc-4.5*),)
-                                 HB_COMPILER_VER := 45
-                              else
-                              ifneq ($(wildcard $(dir $(HB_COMP_PATH))mingw32-gcc-4.4*),)
-                                 HB_COMPILER_VER := 44
-                              else
-                              ifneq ($(wildcard $(dir $(HB_COMP_PATH))mingw32-gcc-4.3*),)
-                                 HB_COMPILER_VER := 43
-                              else
-                              ifneq ($(wildcard $(dir $(HB_COMP_PATH))mingw32-gcc-3.4*),)
-                                 HB_COMPILER_VER := 34
-                              endif
-                              endif
-                              endif
-                              endif
+                                 HB_COMPILER := mingw
+                                 ifneq ($(wildcard $(dir $(HB_COMP_PATH))mingw32-gcc-4.6*),)
+                                    HB_COMPILER_VER := 46
+                                 else
+                                 ifneq ($(wildcard $(dir $(HB_COMP_PATH))mingw32-gcc-4.5*),)
+                                    HB_COMPILER_VER := 45
+                                 else
+                                 ifneq ($(wildcard $(dir $(HB_COMP_PATH))mingw32-gcc-4.4*),)
+                                    HB_COMPILER_VER := 44
+                                 else
+                                 ifneq ($(wildcard $(dir $(HB_COMP_PATH))mingw32-gcc-4.3*),)
+                                    HB_COMPILER_VER := 43
+                                 else
+                                 ifneq ($(wildcard $(dir $(HB_COMP_PATH))mingw32-gcc-3.4*),)
+                                    HB_COMPILER_VER := 34
+                                 endif
+                                 endif
+                                 endif
+                                 endif
+                                 endif
                               endif
                            else
                               HB_COMP_PATH := $(call find_in_path,wcc386)
diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg
index 6d10fe94df..aeeb9b0277 100644
--- a/harbour/utils/hbmk2/hbmk2.prg
+++ b/harbour/utils/hbmk2/hbmk2.prg
@@ -1412,6 +1412,7 @@ FUNCTION hbmk2( aArgs, nArgTarget, /* @ */ lPause, nLevel )
                     { {|| FindInPath( "gcc-dw2" ) }, "mingw", "", "-dw2" },; /* tdragon DWARF-2 build */
                     { {|| FindInPath( "x86_64-pc-mingw32-gcc"   ) }, "mingw64" },; /* Equation Solution build */
                     { {|| FindInPath( "i686-w64-mingw32-gcc"    ) }, "mingw64", "i686-w64-mingw32-" },; /* mingw-w64 build */
+                    { {|| FindInSamePath( "x86_64-w64-mingw32-gcc.exe", "gcc" ) }, "mingw64" },; /* mingw-w64 TDM build */
                     { {|| FindInPath( "x86_64-w64-mingw32-gcc"  ) }, "mingw64", "x86_64-w64-mingw32-" },; /* mingw-w64 build */
                     { {|| FindInPath( hbmk[ _HBMK_cCCPREFIX ] + "gcc" + hbmk[ _HBMK_cCCPOSTFIX ] ) }, "mingw" },;
                     { {|| iif( ! Empty( GetEnv( "WATCOM" ) ),;