From a2a495e842feb1ce4aca2b4b021e15decbc2ec31 Mon Sep 17 00:00:00 2001 From: "Jake.Stine" Date: Wed, 7 Oct 2009 03:52:05 +0000 Subject: [PATCH] wxWidgets/Win32: Keep wx from including into every app/gui related file; reduces window.h global namespace pollution and speeds up compilation times a little bit. git-svn-id: http://pcsx2.googlecode.com/svn/trunk@1974 96395faa-99c1-11dd-bbfe-3dabce05a288 --- 3rdparty/3rdparty.vsprops | 2 +- 3rdparty/w32pthreads/include/pthread.h | 6 ++++-- 3rdparty/wxWidgets/include/wx/msw/app.h | 7 ++++++- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/3rdparty/3rdparty.vsprops b/3rdparty/3rdparty.vsprops index 54cc5b8739..3cfc4428f6 100644 --- a/3rdparty/3rdparty.vsprops +++ b/3rdparty/3rdparty.vsprops @@ -5,7 +5,7 @@ Name="3rdparty" OutputDirectory="$(SvnRootDir)\deps\$(PlatformName)\$(ConfigurationName)" IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" - DeleteExtensionsOnClean="*.bsc;*.idb;*.sbr;*.res;*.pch;*.pdb;*.obj;*.ilk;*.tlb;*.tli;*.tlh;*.tmp;*.rsp;*.pgc;*.pgd;*.meta;$(TargetPath)" + DeleteExtensionsOnClean="*.bsc;*.idb;*.sbr;*.res;*.pch;*.pdb;*.obj;*.tlb;*.tli;*.tlh;*.tmp;*.rsp;*.pgc;*.pgd;*.meta;$(TargetPath)" > #endif /* HAVE_SIGNAL_H */ +#ifndef __CLEANUP_C #include +#endif #include /* diff --git a/3rdparty/wxWidgets/include/wx/msw/app.h b/3rdparty/wxWidgets/include/wx/msw/app.h index 196600e58a..10d5d4590b 100644 --- a/3rdparty/wxWidgets/include/wx/msw/app.h +++ b/3rdparty/wxWidgets/include/wx/msw/app.h @@ -89,7 +89,12 @@ protected: // ---------------------------------------------------------------------------- // we need HINSTANCE declaration to define WinMain() -#include "wx/msw/wrapwin.h" +// PCSX2: No we don't. Having windows includes to all of PCSX2 sucks, and this is precisely +// what C/C++ "forward" declarations were designed to fix. --air +//#include "wx/msw/wrapwin.h" + +struct HINSTANCE__; +typedef struct HINSTANCE__* HINSTANCE; #ifndef SW_SHOWNORMAL #define SW_SHOWNORMAL 1