linuxdcpp-team team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 3273
committer: poy <poy@xxxxxxxxxx>
branch nick: trunk
timestamp: Tue 2013-04-23 19:57:04 +0200
message:
  assume mingw64 by default
modified:
  SConstruct
  dwt/include/dwt/GCCHeaders.h
  win32/AboutDlg.cpp
  win32/CrashLogger.cpp
  win32/WinUtil.cpp
  win32/compiler.h


--
lp:dcplusplus
https://code.launchpad.net/~dcplusplus-team/dcplusplus/trunk

Your team Dcplusplus-team is subscribed to branch lp:dcplusplus.
To unsubscribe from this branch go to https://code.launchpad.net/~dcplusplus-team/dcplusplus/trunk/+edit-subscription

=== modified file 'SConstruct'
--- SConstruct	2013-04-21 17:39:36 +0000
+++ SConstruct	2013-04-23 17:57:04 +0000
@@ -263,10 +263,11 @@
 # see whether we're compiling with MinGW or MinGW-w64 (2 different projects that can both build
 # a 32-bit program). the only differentiator is __MINGW64_VERSION_MAJOR.
 if conf.CheckDeclaration('__MINGW64_VERSION_MAJOR', '#include <windows.h>', 'C++'):
-	conf.env.Append(CPPDEFINES='HAVE_MINGW64')
 	if conf.env['pch']:
 		conf.env['pch'] = 0 # precompiled headers crash mingw64's gcc...
 		conf.env['CPPDEFINES'].remove('HAS_PCH')
+else:
+	conf.env.Append(CPPDEFINES='HAVE_OLD_MINGW')
 env = conf.Finish()
 
 dev.archive = dev.build('archive/')

=== modified file 'dwt/include/dwt/GCCHeaders.h'
--- dwt/include/dwt/GCCHeaders.h	2013-01-19 16:42:57 +0000
+++ dwt/include/dwt/GCCHeaders.h	2013-04-23 17:57:04 +0000
@@ -410,7 +410,7 @@
 } DTTOPTS, *PDTTOPTS; 
 #endif
 
-#ifndef HAVE_MINGW64 // mingw64 already has this
+#ifdef HAVE_OLD_MINGW // mingw64 already has this
 typedef struct tagNMTTCUSTOMDRAW
 {
     NMCUSTOMDRAW nmcd;

=== modified file 'win32/AboutDlg.cpp'
--- win32/AboutDlg.cpp	2013-04-16 17:39:15 +0000
+++ win32/AboutDlg.cpp	2013-04-23 17:57:04 +0000
@@ -116,10 +116,10 @@
 		gs.caption = T_("Compiler");
 		// see also CrashLogger.cpp for similar tests.
 #ifdef __MINGW32__
-#ifdef HAVE_MINGW64
+#ifdef HAVE_OLD_MINGW
+		ts.caption = Text::toT("MinGW's GCC " __VERSION__);
+#else
 		ts.caption = Text::toT("MinGW-w64's GCC " __VERSION__);
-#else
-		ts.caption = Text::toT("MinGW's GCC " __VERSION__);
 #endif
 #elif defined(_MSC_VER)
 		ts.caption = Text::toT("MS Visual Studio " + Util::toString(_MSC_VER));

=== modified file 'win32/CrashLogger.cpp'
--- win32/CrashLogger.cpp	2013-04-16 17:39:15 +0000
+++ win32/CrashLogger.cpp	2013-04-23 17:57:04 +0000
@@ -467,10 +467,10 @@
 
 	// see also AboutDlg.cpp for similar tests.
 #ifdef __MINGW32__
-#ifdef HAVE_MINGW64
+#ifdef HAVE_OLD_MINGW
+	fputs("Compiled with MinGW's GCC " __VERSION__, f);
+#else
 	fputs("Compiled with MinGW-w64's GCC " __VERSION__, f);
-#else
-	fputs("Compiled with MinGW's GCC " __VERSION__, f);
 #endif
 #elif defined(_MSC_VER)
 	fprintf(f, "Compiled with MS Visual Studio %d", _MSC_VER);

=== modified file 'win32/WinUtil.cpp'
--- win32/WinUtil.cpp	2013-04-22 22:31:37 +0000
+++ win32/WinUtil.cpp	2013-04-23 17:57:04 +0000
@@ -72,7 +72,7 @@
 extern "C" {
 	void HH_GS_CALL __GSHandlerCheck() { }
 	void HH_GS_CALL __security_check_cookie(uintptr_t) { }
-#ifndef HAVE_MINGW64
+#ifdef HAVE_OLD_MINGW
 	uintptr_t __security_cookie;
 #endif
 }

=== modified file 'win32/compiler.h'
--- win32/compiler.h	2013-03-25 20:52:49 +0000
+++ win32/compiler.h	2013-04-23 17:57:04 +0000
@@ -21,7 +21,7 @@
 #error GCC 4.8 is required
 #endif
 
-#ifndef HAVE_MINGW64
+#ifdef HAVE_OLD_MINGW
 #error Regular MinGW has stability problems; use a MinGW package from mingw-w64
 // see <https://bugs.launchpad.net/dcplusplus/+bug/1029629> for details
 #endif