Remove windows.h from the precompiled header

It's only used by a few source files and it defines a ton of garbage.
This commit is contained in:
Thomas Goyne 2012-10-29 15:02:41 -07:00
parent 08983adc96
commit 9088ae994c
6 changed files with 9 additions and 12 deletions

View file

@ -18,9 +18,11 @@
#ifndef LAGI_PRE
#include <string>
#include <windows.h>
#endif
#define WIN32_LEAN_AND_MEAN
#include <windows.h>
namespace agi {
namespace util {

View file

@ -20,11 +20,6 @@
// Windows C
#ifdef _WIN32
// "Lean and mean" causes windows.h to include less stuff, mostly rarely-used things.
// We can't build without being "lean and mean", some of the things included by it has
// macros that clash with variable names around Aegisub causing strange build errors.
#define WIN32_LEAN_AND_MEAN
#include <windows.h>
#include <io.h>
#endif

View file

@ -20,9 +20,6 @@
#include <stdio.h>
#include <time.h>
#include <string.h>
#define WIN32_LEAN_AND_MEAN
#include <windows.h>
#endif
#include "libaegisub/log.h"
@ -30,6 +27,9 @@
#include "libaegisub/charset_conv_win.h"
#include "libaegisub/util.h"
#define WIN32_LEAN_AND_MEAN
#include <windows.h>
namespace agi {
namespace log {

View file

@ -68,7 +68,6 @@
#include <wchar.h>
#ifdef _WIN32
#include <windows.h>
#include <objbase.h>
#include <mmsystem.h>
#else

View file

@ -40,6 +40,7 @@
#endif
#ifdef _WIN32
#define WIN32_LEAN_AND_MEAN
#include <windows.h>
#endif
@ -47,7 +48,6 @@
#include <libaegisub/scoped_ptr.h>
/// DOCME
/// @class PCMAudioProvider
/// @brief DOCME

View file

@ -39,7 +39,6 @@
#ifndef AGI_PRE
#ifdef __WINDOWS__
#include <tchar.h>
#include <windows.h>
#endif
#include <wx/button.h>
@ -54,6 +53,8 @@
#endif
#ifdef _WIN32
#define WIN32_LEAN_AND_MEAN
#include <windows.h>
#include <tuple>
#else
#include <tr1/tuple>