SF.net SVN: mahogany:[7572] trunk/M/include/Mconfig.h

Revision: 7572
          http://mahogany.svn.sourceforge.net/mahogany/?rev=7572&view=rev
Author:   vadz
Date:     2009-09-05 13:18:26 +0000 (Sat, 05 Sep 2009)

Log Message:
-----------
Support building with latest combined debug/release wx builds.

Modified Paths:
--------------
    trunk/M/include/Mconfig.h

Modified: trunk/M/include/Mconfig.h
===================================================================
--- trunk/M/include/Mconfig.h	2009-07-21 00:30:57 UTC (rev 7571)
+++ trunk/M/include/Mconfig.h	2009-09-05 13:18:26 UTC (rev 7572)
@@ -128,19 +128,23 @@
 #   endif
 #endif
 
-// make sure that wxWin and M settings are in sync: although in theory it
-// should be possible to use mismatching settings, in practice this more often
-// doesn't work than does, so please don't do it unless you really know what
-// you're doing
-#ifdef DEBUG
-#   ifndef __WXDEBUG__
-#      error "Please use debug version of wxWindows with debug Mahogany build."
-#   endif
-#else // Release
-#   ifdef __WXDEBUG__
-#      error "Please don't use debug version of wxWindows with non-debug Mahogany build."
-#   endif
-#endif // Debug/Release
+// M debug mode is closely related to wx2 debug mode and so debug build of wx
+// must be used with debug build of M and release build of wx with the release
+// one
+//
+// but in wx3 (actually already 2.9.1) there is no more distinction between
+// debug and release build so this check shouldn't be done
+#if !wxCHECK_VERSION(2, 9, 1)
+#  ifdef DEBUG
+#     ifndef __WXDEBUG__
+#        error "Please use debug version of wxWindows with debug Mahogany build."
+#     endif
+#  else // Release
+#     ifdef __WXDEBUG__
+#        error "Please don't use debug version of wxWindows with non-debug Mahogany build."
+#     endif
+#  endif // Debug/Release
+#endif // wx < 2.9.1
 
 // ----------------------------------------------------------------------------
 // miscellaneous other stuff


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day 
trial. Simplify your report design, integration and deployment - and focus on 
what you do best, core application coding. Discover what's new with 
Crystal Reports now.  http://p.sf.net/sfu/bobj-july