X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d22004c4f4cc39c10605943572251c72061e28ae..09d8cc190df922a72d7dc9f9fdc3a51c037a3ca2:/include/wx/wxprec.h

diff --git a/include/wx/wxprec.h b/include/wx/wxprec.h
index b05ad2b35c..4037833a48 100644
--- a/include/wx/wxprec.h
+++ b/include/wx/wxprec.h
@@ -20,9 +20,11 @@
          defined(__DIGITALMARS__) || \
          defined(__WATCOMC__) ) ) || \
       defined(__VISAGECPP__) || \
-      defined(__MWERKS__) 
+      defined(__MWERKS__)
 
-    #if !defined(NOPCH)
+    // If user did not request NOCPH and we're not building using configure
+    // then assume user wants precompiled headers.
+    #if !defined(NOPCH) && !defined(__WX_SETUP_H__)
         #define WX_PRECOMP
     #endif
 #endif
@@ -39,7 +41,7 @@
 #include "wx/wxchar.h"
 
 // include standard Windows headers
-#if defined(__WXMSW__) && !wxUSE_MFC
+#if defined(__WXMSW__)
     #include "wx/msw/wrapwin.h"
 #endif