mirror of https://github.com/PCSX2/pcsx2.git
wxWidgets/Win32: Keep wx from including <windows.h> 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
This commit is contained in:
parent
6583b1623b
commit
a2a495e842
|
@ -5,7 +5,7 @@
|
||||||
Name="3rdparty"
|
Name="3rdparty"
|
||||||
OutputDirectory="$(SvnRootDir)\deps\$(PlatformName)\$(ConfigurationName)"
|
OutputDirectory="$(SvnRootDir)\deps\$(PlatformName)\$(ConfigurationName)"
|
||||||
IntermediateDirectory="$(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)"
|
||||||
>
|
>
|
||||||
<Tool
|
<Tool
|
||||||
Name="VCCLCompilerTool"
|
Name="VCCLCompilerTool"
|
||||||
|
|
|
@ -37,8 +37,8 @@
|
||||||
* See the README file for an explanation of the pthreads-win32 version
|
* See the README file for an explanation of the pthreads-win32 version
|
||||||
* numbering scheme and how the DLL is named etc.
|
* numbering scheme and how the DLL is named etc.
|
||||||
*/
|
*/
|
||||||
#define PTW32_VERSION 2,8,0,0
|
#define PTW32_VERSION 2,8,0,3
|
||||||
#define PTW32_VERSION_STRING "2, 8, 0, 0\0"
|
#define PTW32_VERSION_STRING "2, 8, 0, 3\0"
|
||||||
|
|
||||||
/* There are three implementations of cancel cleanup.
|
/* There are three implementations of cancel cleanup.
|
||||||
* Note that pthread.h is included in both application
|
* Note that pthread.h is included in both application
|
||||||
|
@ -224,7 +224,9 @@ typedef unsigned long DWORD_PTR;
|
||||||
#include <signal.h>
|
#include <signal.h>
|
||||||
#endif /* HAVE_SIGNAL_H */
|
#endif /* HAVE_SIGNAL_H */
|
||||||
|
|
||||||
|
#ifndef __CLEANUP_C
|
||||||
#include <setjmp.h>
|
#include <setjmp.h>
|
||||||
|
#endif
|
||||||
#include <limits.h>
|
#include <limits.h>
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
|
@ -89,7 +89,12 @@ protected:
|
||||||
// ----------------------------------------------------------------------------
|
// ----------------------------------------------------------------------------
|
||||||
|
|
||||||
// we need HINSTANCE declaration to define WinMain()
|
// 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
|
#ifndef SW_SHOWNORMAL
|
||||||
#define SW_SHOWNORMAL 1
|
#define SW_SHOWNORMAL 1
|
||||||
|
|
Loading…
Reference in New Issue