fivedev/harbour-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2011-07-08 12:56 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)

Browse Source 
* utils/hbmk2/hbmk2.prg
  * config/global.mk
    + mingw64-tdm autodetection.
      PLEASE TEST!
This commit is contained in:
Viktor Szakats
2011-07-08 10:57:04 +00:00
parent ca55ccf0ac
commit 59ff7cb487
3 changed files with 37 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
harbour/ChangeLog
View File

@@ -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

48
harbour/config/global.mk
View File

@@ -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)

1
harbour/utils/hbmk2/hbmk2.prg
View File

@@ -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" ) ),;