mirror of
https://github.com/CookiePLMonster/SilentPatch.git
synced 2024-12-29 23:33:02 +05:00
Set Windows defines earlier
This avoids compile warnings on MinGW GCC (because standard C++ headers eventually import the Windows stuff)
This commit is contained in:
parent
c15fbc549d
commit
fe6f98c314
4 changed files with 10 additions and 9 deletions
|
@ -1,11 +1,11 @@
|
||||||
#include "Common_ddraw.h"
|
|
||||||
|
|
||||||
#define WIN32_LEAN_AND_MEAN
|
#define WIN32_LEAN_AND_MEAN
|
||||||
|
|
||||||
#define WINVER 0x0501
|
#define WINVER 0x0501
|
||||||
#define _WIN32_WINNT 0x0501
|
#define _WIN32_WINNT 0x0501
|
||||||
#define NOMINMAX
|
#define NOMINMAX
|
||||||
|
|
||||||
|
#include "Common_ddraw.h"
|
||||||
|
|
||||||
#include <windows.h>
|
#include <windows.h>
|
||||||
|
|
||||||
#include <shlwapi.h>
|
#include <shlwapi.h>
|
||||||
|
|
|
@ -1,11 +1,11 @@
|
||||||
#include "Desktop.h"
|
|
||||||
|
|
||||||
#define WIN32_LEAN_AND_MEAN
|
#define WIN32_LEAN_AND_MEAN
|
||||||
|
|
||||||
#define WINVER 0x0501
|
#define WINVER 0x0501
|
||||||
#define _WIN32_WINNT 0x0501
|
#define _WIN32_WINNT 0x0501
|
||||||
#define NOMINMAX
|
#define NOMINMAX
|
||||||
|
|
||||||
|
#include "Desktop.h"
|
||||||
|
|
||||||
#include <windows.h>
|
#include <windows.h>
|
||||||
|
|
||||||
std::pair<uint32_t, uint32_t> GetDesktopResolution()
|
std::pair<uint32_t, uint32_t> GetDesktopResolution()
|
||||||
|
@ -21,4 +21,4 @@ std::pair<uint32_t, uint32_t> GetDesktopResolution()
|
||||||
result.second = displaySettings.dmPelsHeight;
|
result.second = displaySettings.dmPelsHeight;
|
||||||
}
|
}
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,5 +1,3 @@
|
||||||
#include "FriendlyMonitorNames.h"
|
|
||||||
|
|
||||||
// This API is Win7 only, so make sure we use dynamic imports
|
// This API is Win7 only, so make sure we use dynamic imports
|
||||||
#define WIN32_LEAN_AND_MEAN
|
#define WIN32_LEAN_AND_MEAN
|
||||||
|
|
||||||
|
@ -7,6 +5,8 @@
|
||||||
#define WINVER 0x0602
|
#define WINVER 0x0602
|
||||||
#define _WIN32_WINNT 0x0602
|
#define _WIN32_WINNT 0x0602
|
||||||
|
|
||||||
|
#include "FriendlyMonitorNames.h"
|
||||||
|
|
||||||
#include <windows.h>
|
#include <windows.h>
|
||||||
|
|
||||||
#include <memory>
|
#include <memory>
|
||||||
|
|
|
@ -1,7 +1,8 @@
|
||||||
#include "ParseUtils.hpp"
|
|
||||||
|
|
||||||
#define WIN32_LEAN_AND_MEAN
|
#define WIN32_LEAN_AND_MEAN
|
||||||
#define NOMINMAX
|
#define NOMINMAX
|
||||||
|
|
||||||
|
#include "ParseUtils.hpp"
|
||||||
|
|
||||||
#include <windows.h>
|
#include <windows.h>
|
||||||
|
|
||||||
static std::string WcharToUTF8(std::wstring_view str)
|
static std::string WcharToUTF8(std::wstring_view str)
|
||||||
|
|
Loading…
Reference in a new issue