From fe9baad66f7aeeac04d798ab8b65adb2e13ba87c Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Fri, 7 May 2010 15:46:56 +0000 Subject: [PATCH] 2010-05-07 17:44 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * INSTALL - Deleted 'rarely updated' from official mingw comment. - Deleted equation mingw edition. * QT 4.5.x is not recommended over 4.6.x anymore. + Added link for QT 4.6.x. + Added more details to mingw version with DWARF support. (required for QT 4.6.x) * config/win/mingw.mk + Added more comment on newly added linker options. ! Fixed to only enable newly added linker options for 4.5.x and above. (tdm 4.4.x doesn't support them) --- harbour/ChangeLog | 14 ++++++++++++++ harbour/INSTALL | 6 +++--- harbour/config/win/mingw.mk | 5 ++++- 3 files changed, 21 insertions(+), 4 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 486e808c5e..30dc5396a0 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -17,6 +17,20 @@ past entries belonging to author(s): Viktor Szakats. */ +2010-05-07 17:44 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) + * INSTALL + - Deleted 'rarely updated' from official mingw comment. + - Deleted equation mingw edition. + * QT 4.5.x is not recommended over 4.6.x anymore. + + Added link for QT 4.6.x. + + Added more details to mingw version with DWARF support. + (required for QT 4.6.x) + + * config/win/mingw.mk + + Added more comment on newly added linker options. + ! Fixed to only enable newly added linker options for + 4.5.x and above. (tdm 4.4.x doesn't support them) + 2010-05-07 17:28 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * config/global.mk + Won't falsely autodetect cygwin if cygstart.exe doesn't diff --git a/harbour/INSTALL b/harbour/INSTALL index 5aa6815b5f..45b7ca4009 100644 --- a/harbour/INSTALL +++ b/harbour/INSTALL @@ -1304,8 +1304,7 @@ HARBOUR MinGW [win, *nix, free, open-soource] http://www.tdragon.net/recentgcc/, http://sourceforge.net/projects/tdm-gcc/ (unofficial, recommended) - http://www.mingw.org/, http://sourceforge.net/projects/mingw/ (official, rarely updated, MSYS home) - http://www.equation.com/servlet/equation.cmd?fa=fortran (unofficial) + http://www.mingw.org/, http://sourceforge.net/projects/mingw/ (official, MSYS home) MinGW x64 [win, *nix, free, open-source] http://mingw-w64.sourceforge.net/, http://sourceforge.net/projects/mingw-w64/ http://www.cadforte.com/ @@ -1391,12 +1390,13 @@ HARBOUR http://get.qt.nokia.com/qt/source/ Currently supported Windows binary package: http://get.qt.nokia.com/qt/source/qt-win-opensource-4.5.3-mingw.exe + http://get.qt.nokia.com/qt/source/qt-win-opensource-4.6.2-mingw.exe How to create static and MSVC builds: http://doc.trolltech.com/4.5/deployment-windows.html NOTES: - QT 4.5.x requires MinGW builds with SJLJ stack frame unwinding. - (This is the recommended QT version to use with Harbour.) - QT 4.6.x requires MinGW builds with DWARF-2 stack frame unwinding. + (mingw official 4.4.0 or upper, or mingw tdm with dwarf update) HB_WITH_SQLITE3 - sqlite3 [multiplatform, free, open-source] http://www.sqlite.org/ HB_WITH_WATT - Watt-32 (TCP/IP sockets) [dos, free, open-source] diff --git a/harbour/config/win/mingw.mk b/harbour/config/win/mingw.mk index d359fdfe77..f14fe007cd 100644 --- a/harbour/config/win/mingw.mk +++ b/harbour/config/win/mingw.mk @@ -23,7 +23,10 @@ ifeq ($(filter $(HB_COMPILER_VER),29 34 40),) #CFLAGS += -fstack-protector endif -ifeq ($(filter $(HB_COMPILER_VER),29 34 40 41 42 43),) +# It is also supported by official mingw 4.4.x and mingw64 4.4.x, +# but not supported by mingw tdm 4.4.x, so I only enable it on or +# above 4.5.0. +ifeq ($(filter $(HB_COMPILER_VER),29 34 40 41 42 43 44),) LDFLAGS += -Wl,--nxcompat -Wl,--dynamicbase DFLAGS += -Wl,--nxcompat -Wl,--dynamicbase endif