diff --git a/harbour/ChangeLog b/harbour/ChangeLog index b62e9e09f2..f811f55de3 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -17,6 +17,29 @@ past entries belonging to author(s): Viktor Szakats. */ +2009-06-22 15:48 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) + * contrib/gtwvg/Makefile + ! Disabled for mingw C++ mode. + Due to fatal errors reported to the dev list. + ; TOFIX + + * contrib/hbwin/hbwinole.h + ! Fixed for mingw C++ mode. + + + package + + package/harbour.ico + + Added harbour.ico to central place. + + * utils/hbmk2/hbmk2.prg + - Deleted support for HB_COMPILET=gpp. Use -cpp switch instead. + + - utils/hbrun/hbrun.ico + * utils/hbrun/hbrun.rc + * Using central harbour.ico. + + * mpkg_win.nsi + + Added Harbour icon to the installer executable. + 2009-06-22 15:23 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * INSTALL + Documented HB_BUILD_MODE envvar. diff --git a/harbour/contrib/gtwvg/Makefile b/harbour/contrib/gtwvg/Makefile index 01a5db00e6..e5d665245e 100644 --- a/harbour/contrib/gtwvg/Makefile +++ b/harbour/contrib/gtwvg/Makefile @@ -12,8 +12,12 @@ ifeq ($(HB_WITH_GTWVG),) ifeq ($(HB_ARCHITECTURE),win) ifeq ($(HB_COMPILER),mingw) +ifeq ($(HB_BUILD_MODE),cpp) +HB_WITH_GTWVG=no +#else HB_WITH_GTWVG=yes endif +endif ifeq ($(HB_COMPILER),msvc) HB_WITH_GTWVG=yes endif diff --git a/harbour/contrib/hbwin/hbwinole.h b/harbour/contrib/hbwin/hbwinole.h index 5a167a4673..c938c93160 100644 --- a/harbour/contrib/hbwin/hbwinole.h +++ b/harbour/contrib/hbwin/hbwinole.h @@ -82,7 +82,9 @@ /* macros used to hide type of interface: C or C++ */ #if defined( __cplusplus ) && !defined( CINTERFACE ) && \ - ( defined( __BORLANDC__ ) || defined( _MSC_VER ) || \ + ( defined( __BORLANDC__ ) || \ + defined( _MSC_VER ) || \ + defined( __MINGW32__ ) || \ ( defined(__WATCOMC__) && ( __WATCOMC__ >= 1270 ) ) ) # define HB_ID_REF( id ) ( id ) # define HB_VTBL( pSelf ) ( pSelf ) diff --git a/harbour/mpkg_win.nsi b/harbour/mpkg_win.nsi index 61b0a32419..eaa9163a3d 100644 --- a/harbour/mpkg_win.nsi +++ b/harbour/mpkg_win.nsi @@ -20,6 +20,7 @@ !define MUI_HEADERIMAGE_BITMAP "${NSISDIR}\Contrib\Graphics\Header\win.bmp" !define MUI_FINISHPAGE_SHOWREADME_NOTCHECKED !define MUI_FINISHPAGE_SHOWREADME "$INSTDIR\doc\readme.txt" + !define MUI_ICON "package\harbour.ico" SetDateSave on SetDatablockOptimize on diff --git a/harbour/utils/hbrun/hbrun.ico b/harbour/package/harbour.ico similarity index 100% rename from harbour/utils/hbrun/hbrun.ico rename to harbour/package/harbour.ico diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg index b22e9d8ea3..19dd2a63fe 100644 --- a/harbour/utils/hbmk2/hbmk2.prg +++ b/harbour/utils/hbmk2/hbmk2.prg @@ -933,7 +933,7 @@ FUNCTION hbmk( aArgs, /* @ */ lPause, /* @ */ lUTF8 ) DO CASE CASE hbmk[ _HBMK_cARCH ] $ "bsd|hpux|sunos|linux" .OR. hbmk[ _HBMK_cARCH ] == "darwin" /* Separated to avoid match with 'win' */ IF hbmk[ _HBMK_cARCH ] == "linux" - aCOMPSUP := { "gcc", "gpp", "watcom", "icc" } + aCOMPSUP := { "gcc", "watcom", "icc" } ELSE aCOMPSUP := { "gcc" } ENDIF @@ -1992,7 +1992,7 @@ FUNCTION hbmk( aArgs, /* @ */ lPause, /* @ */ lUTF8 ) ENDIF ENDIF - IF hbmk[ _HBMK_cCOMP ] $ "watcom|gpp" .AND. l_lCPP == NIL + IF hbmk[ _HBMK_cCOMP ] == "watcom" .AND. l_lCPP == NIL l_lCPP := .T. ENDIF @@ -2003,7 +2003,6 @@ FUNCTION hbmk( aArgs, /* @ */ lPause, /* @ */ lUTF8 ) ( hbmk[ _HBMK_cARCH ] == "hpux" .AND. hbmk[ _HBMK_cCOMP ] == "gcc" ) .OR. ; ( hbmk[ _HBMK_cARCH ] == "sunos" .AND. hbmk[ _HBMK_cCOMP ] == "gcc" ) .OR. ; ( hbmk[ _HBMK_cARCH ] == "linux" .AND. hbmk[ _HBMK_cCOMP ] == "gcc" ) .OR. ; - ( hbmk[ _HBMK_cARCH ] == "linux" .AND. hbmk[ _HBMK_cCOMP ] == "gpp" ) .OR. ; ( hbmk[ _HBMK_cARCH ] == "linux" .AND. hbmk[ _HBMK_cCOMP ] == "icc" ) nOpt_Esc := _ESC_NIX @@ -4202,7 +4201,7 @@ STATIC FUNCTION FindNewerHeaders( hbmk, cFileName, cParentDir, tTimeParent, lInc cExt := Lower( FN_ExtGet( cFileName ) ) /* Filter out non-source format inputs for MinGW / windres */ - IF hbmk[ _HBMK_cCOMP ] $ "gcc|gpp|mingw|mingw64|mingwarm|cygwin" .AND. hbmk[ _HBMK_cARCH ] $ "win|wce" .AND. cExt == ".res" + IF hbmk[ _HBMK_cCOMP ] $ "gcc|mingw|mingw64|mingwarm|cygwin" .AND. hbmk[ _HBMK_cARCH ] $ "win|wce" .AND. cExt == ".res" RETURN .F. ENDIF @@ -4347,7 +4346,7 @@ STATIC FUNCTION LibExists( hbmk, cDir, cLib, cLibExt ) cDir := DirAddPathSep( PathSepToSelf( cDir ) ) DO CASE - CASE hbmk[ _HBMK_cCOMP ] $ "gcc|gpp|mingw|mingw64|mingwarm|cygwin" .AND. hbmk[ _HBMK_cARCH ] $ "win|wce" + CASE hbmk[ _HBMK_cCOMP ] $ "gcc|mingw|mingw64|mingwarm|cygwin" .AND. hbmk[ _HBMK_cARCH ] $ "win|wce" /* NOTE: ld/gcc option -dll-search-prefix isn't taken into account here, So, 'xxx.dll' format libs won't be found by hbmk. */ DO CASE @@ -4358,7 +4357,7 @@ STATIC FUNCTION LibExists( hbmk, cDir, cLib, cLibExt ) CASE hb_FileExists( tmp := cDir + "lib" + FN_ExtSet( cLib, ".dll" ) ) ; RETURN tmp CASE hb_FileExists( tmp := cDir + FN_ExtSet( cLib, ".dll" ) ) ; RETURN tmp ENDCASE - CASE hbmk[ _HBMK_cCOMP ] $ "gcc|gpp" .AND. hbmk[ _HBMK_cARCH ] $ "linux|sunos" + CASE hbmk[ _HBMK_cCOMP ] == "gcc" .AND. hbmk[ _HBMK_cARCH ] $ "linux|sunos" DO CASE CASE hb_FileExists( tmp := cDir + "lib" + FN_ExtSet( cLib, ".so" ) ) ; RETURN tmp CASE hb_FileExists( tmp := cDir + "lib" + FN_ExtSet( cLib, ".a" ) ) ; RETURN tmp @@ -4509,7 +4508,7 @@ STATIC FUNCTION ListCookLib( hbmk, arraySrc, cExtNew ) LOCAL cDir LOCAL cLibName - IF hbmk[ _HBMK_cCOMP ] $ "gcc|gpp|mingw|mingw64|mingwarm|djgpp|cygwin" + IF hbmk[ _HBMK_cCOMP ] $ "gcc|mingw|mingw64|mingwarm|djgpp|cygwin" FOR EACH cLibName IN array hb_FNameSplit( cLibName, @cDir ) IF Empty( cDir ) @@ -5491,7 +5490,7 @@ STATIC FUNCTION getFirstFunc( hbmk, cFile ) LOCAL cFuncList, cExecNM, cFuncName, cExt, cLine, n, c cFuncName := "" - IF hbmk[ _HBMK_cCOMP ] $ "gcc|gpp|mingw|mingw64|mingwarm|cygwin" + IF hbmk[ _HBMK_cCOMP ] $ "gcc|mingw|mingw64|mingwarm|cygwin" hb_FNameSplit( cFile,,, @cExt ) IF cExt == ".c" FOR EACH cLine IN hb_ATokens( StrTran( hb_MemoRead( cFile ), Chr( 13 ), Chr( 10 ) ), Chr( 10 ) ) @@ -6257,7 +6256,7 @@ FUNCTION hbmk_CPU( hbmk ) DO CASE CASE hbmk[ _HBMK_cARCH ] $ "dos|os2" .OR. ; - hbmk[ _HBMK_cCOMP ] $ "gcc|gpp|cygwin|watcom|bcc|icc|xcc" .OR. ; + hbmk[ _HBMK_cCOMP ] $ "gcc|cygwin|watcom|bcc|icc|xcc" .OR. ; hbmk[ _HBMK_cCOMP ] == "mingw" .OR. ; hbmk[ _HBMK_cCOMP ] == "msvc" .OR. ; hbmk[ _HBMK_cCOMP ] == "pocc" @@ -6290,7 +6289,7 @@ FUNCTION hbmk_KEYW( hbmk, cKeyword ) IF ( cKeyword == "unix" .AND. ( hbmk[ _HBMK_cARCH ] $ "bsd|hpux|sunos|linux" .OR. hbmk[ _HBMK_cARCH ] == "darwin" ) ) .OR. ; ( cKeyword == "allwin" .AND. hbmk[ _HBMK_cARCH ] $ "win|wce" ) .OR. ; - ( cKeyword == "allgcc" .AND. hbmk[ _HBMK_cCOMP ] $ "gcc|gpp|mingw|mingw64|mingwarm|cygwin|djgpp" ) .OR. ; + ( cKeyword == "allgcc" .AND. hbmk[ _HBMK_cCOMP ] $ "gcc|mingw|mingw64|mingwarm|cygwin|djgpp" ) .OR. ; ( cKeyword == "allmingw" .AND. hbmk[ _HBMK_cCOMP ] $ "mingw|mingw64|mingwarm" ) .OR. ; ( cKeyword == "allmsvc" .AND. hbmk[ _HBMK_cCOMP ] $ "msvc|msvc64|msvcarm" ) .OR. ; ( cKeyword == "allpocc" .AND. hbmk[ _HBMK_cCOMP ] $ "pocc|pocc64|poccarm" ) .OR. ; diff --git a/harbour/utils/hbrun/hbrun.rc b/harbour/utils/hbrun/hbrun.rc index 72fde4d0c2..fa46278f6d 100644 --- a/harbour/utils/hbrun/hbrun.rc +++ b/harbour/utils/hbrun/hbrun.rc @@ -50,4 +50,4 @@ * */ -ICON1 ICON DISCARDABLE "hbrun.ico" +ICON1 ICON DISCARDABLE "../../package/harbour.ico"