X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/01fd88a0e645fcbee2006534a6d676d066aa0aaa..2bb3c0c0dd3ae16c5d7ad50a10b10386cbdc529a:/include/wx/wxprec.h

diff --git a/include/wx/wxprec.h b/include/wx/wxprec.h
index f0dd44e107..1d3844dd9c 100644
--- a/include/wx/wxprec.h
+++ b/include/wx/wxprec.h
@@ -5,7 +5,7 @@
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
-// Copyright:   (c)
+// Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
@@ -14,8 +14,17 @@
 
 // check if to use precompiled headers: do it for most Windows compilers unless
 // explicitly disabled by defining NOPCH
-#if ((defined(__BORLANDC__) || defined(__VISUALC__) || defined(__DIGITALMARS__) || defined(__WATCOMC__)) && defined(__WXMSW__)) || defined(__VISAGECPP__) || defined(__MWERKS__) 
-    #if !defined(NOPCH)
+#if ( defined(__WXMSW__) && \
+       ( defined(__BORLANDC__)    || \
+         defined(__VISUALC__)     || \
+         defined(__DIGITALMARS__) || \
+         defined(__WATCOMC__) ) ) || \
+      defined(__VISAGECPP__) || \
+      defined(__MWERKS__)
+
+    // 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
@@ -32,10 +41,15 @@
 #include "wx/wxchar.h"
 
 // include standard Windows headers
-#if defined(__WXMSW__) && !wxUSE_MFC
+#if defined(__WXMSW__)
     #include "wx/msw/wrapwin.h"
 #endif
 
+// include all PalmOS headers at once
+#ifdef __WXPALMOS__
+#   include <PalmOS.h>
+#endif
+
 // include the most common wx headers
 #include "wx/wx.h"