From 2d4dab5875dcf001d692079a21203d1d7624a209 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Sun, 21 Jun 2009 11:15:20 +0000 Subject: [PATCH] 2009-06-21 13:05 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * INSTALL * make_gnu.bat * utils/hbmk2/hbmk2.prg * Updated to reflect new mingw w64 CCPREFIX. It's now in "prerelease" state (formerly "experimental") * INSTALL ! Added missing HB_CCPREFIX for mingw64 and mingwarm examples. --- harbour/ChangeLog | 10 ++++++++++ harbour/INSTALL | 2 ++ harbour/make_gnu.bat | 2 +- harbour/utils/hbmk2/hbmk2.prg | 4 ++-- 4 files changed, 15 insertions(+), 3 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 9fd2ba664b..cbd5531aa9 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -17,6 +17,16 @@ past entries belonging to author(s): Viktor Szakats. */ +2009-06-21 13:05 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) + * INSTALL + * make_gnu.bat + * utils/hbmk2/hbmk2.prg + * Updated to reflect new mingw w64 CCPREFIX. It's now in + "prerelease" state (formerly "experimental") + + * INSTALL + ! Added missing HB_CCPREFIX for mingw64 and mingwarm examples. + 2009-06-21 12:55 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * source/rtl/binnumx.c * contrib/xpp/binnumx.c diff --git a/harbour/INSTALL b/harbour/INSTALL index d80e910220..2e0cb28c11 100644 --- a/harbour/INSTALL +++ b/harbour/INSTALL @@ -370,6 +370,7 @@ EXAMPLES set HB_PPGEN_PATH=%HB_BIN_COMPILE% rem set HB_COMPILER=mingw64 + set HB_CCPREFIX=x86_64-w64-mingw32- set HB_INSTALL_PREFIX=C:\hb-%HB_COMPILER% call make_gnu.bat %1 %2 > log-%HB_COMPILER%.txt 2>&1 --- @@ -382,6 +383,7 @@ EXAMPLES rem set HB_ARCHITECTURE=wce set HB_COMPILER=mingwarm + set HB_CCPREFIX=arm-wince-mingw32ce- set HB_INSTALL_PREFIX=C:\hb-%HB_COMPILER% call make_gnu.bat %1 %2 > log-%HB_COMPILER%.txt 2>&1 --- diff --git a/harbour/make_gnu.bat b/harbour/make_gnu.bat index 39b80c6b25..b8cff7b90c 100644 --- a/harbour/make_gnu.bat +++ b/harbour/make_gnu.bat @@ -58,7 +58,7 @@ if "%HB_COMPILER%" == "" set HB_COMPILER=djgpp call :COMP_DET_ONE pocc.exe pocc win call :COMP_DET_ONE cygstart.exe cygwin win call :COMP_DET_ONE xcc.exe xcc win - call :COMP_DET_ONE x86_64-pc-mingw32-gcc.exe mingw64 win x86_64-pc-mingw32- + call :COMP_DET_ONE x86_64-w64-mingw32-gcc.exe mingw64 win x86_64-w64-mingw32- call :COMP_DET_ONE arm-wince-mingw32ce-gcc.exe mingwarm wce arm-wince-mingw32ce- call :COMP_DET_ONE arm-mingw32ce-gcc.exe mingwarm wce arm-mingw32ce- diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg index dc88b90e6c..5cd95967c5 100644 --- a/harbour/utils/hbmk2/hbmk2.prg +++ b/harbour/utils/hbmk2/hbmk2.prg @@ -994,7 +994,7 @@ FUNCTION hbmk( aArgs, /* @ */ lPause, /* @ */ lUTF8 ) { {|| FindInPath( "icl" ) }, "icc" },; { {|| FindInPath( "cygstart" ) }, "cygwin" },; { {|| FindInPath( "xcc" ) }, "xcc" },; - { {|| FindInPath( "x86_64-pc-mingw32-gcc" ) }, "mingw64", "x86_64-pc-mingw32-" } } + { {|| FindInPath( "x86_64-w64-mingw32-gcc" ) }, "mingw64", "x86_64-w64-mingw32-" } } aCOMPSUP := { "mingw", "msvc", "bcc", "watcom", "icc", "pocc", "xcc", "cygwin",; "mingw64", "msvc64", "msvcia64", "iccia64", "pocc64" } l_aLIBHBGT := { "gtwin", "gtwvt", "gtgui" } @@ -1099,7 +1099,7 @@ FUNCTION hbmk( aArgs, /* @ */ lPause, /* @ */ lUTF8 ) #if defined( __PLATFORM__WINDOWS ) AAdd( aCOMPDET_EMBED, { {| cPrefix | tmp1 := PathNormalize( l_cHB_INSTALL_PREFIX ) + _COMPEMBED_BASE_ + "mingw" + hb_osPathSeparator() + "bin" , iif( hb_FileExists( tmp1 + hb_osPathSeparator() + cPrefix + "gcc" + cCCEXT_mingw ), tmp1, NIL ) }, "win", "mingw" , "" , NIL } ) - AAdd( aCOMPDET_EMBED, { {| cPrefix | tmp1 := PathNormalize( l_cHB_INSTALL_PREFIX ) + _COMPEMBED_BASE_ + "mingw64" + hb_osPathSeparator() + "bin" , iif( hb_FileExists( tmp1 + hb_osPathSeparator() + cPrefix + "gcc" + cCCEXT_mingw ), tmp1, NIL ) }, "win", "mingw64" , "x86_64-pc-mingw32-" , NIL } ) + AAdd( aCOMPDET_EMBED, { {| cPrefix | tmp1 := PathNormalize( l_cHB_INSTALL_PREFIX ) + _COMPEMBED_BASE_ + "mingw64" + hb_osPathSeparator() + "bin" , iif( hb_FileExists( tmp1 + hb_osPathSeparator() + cPrefix + "gcc" + cCCEXT_mingw ), tmp1, NIL ) }, "win", "mingw64" , "x86_64-w64-mingw32-" , NIL } ) AAdd( aCOMPDET_EMBED, { {| cPrefix | tmp1 := PathNormalize( l_cHB_INSTALL_PREFIX ) + _COMPEMBED_BASE_ + "mingwarm" + hb_osPathSeparator() + "bin" , iif( hb_FileExists( tmp1 + hb_osPathSeparator() + cPrefix + "gcc" + cCCEXT_mingw ), tmp1, NIL ) }, "wce", "mingwarm", "arm-mingw32ce-" , NIL } ) AAdd( aCOMPDET_EMBED, { {| cPrefix | tmp1 := PathNormalize( l_cHB_INSTALL_PREFIX ) + _COMPEMBED_BASE_ + "mingwarm" + hb_osPathSeparator() + "bin" , iif( hb_FileExists( tmp1 + hb_osPathSeparator() + cPrefix + "gcc" + cCCEXT_mingw ), tmp1, NIL ) }, "wce", "mingwarm", "arm-wince-mingw32ce-", NIL } ) AAdd( aCOMPDET_EMBED, { {| cPrefix | tmp1 := PathNormalize( l_cHB_INSTALL_PREFIX ) + _COMPEMBED_BASE_ + "djgpp" + hb_osPathSeparator() + "bin" , iif( hb_FileExists( tmp1 + hb_osPathSeparator() + cPrefix + "gcc.exe" ), tmp1, NIL ) }, "dos", "djgpp" , "" , {| cARCH, cCOMP, cPathBin | hbmk_COMP_Setup( cARCH, cCOMP, cPathBin + hb_osPathSeparator() + ".." ) } } )