Rim/iw4x-client
Rim/iw4x-client
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge pull request #783 from diamante0018/develop

Browse Source 
[General]: Cleanup std_include
This commit is contained in:
Edo 2023-02-19 15:28:26 +00:00 committed by GitHub
commit a43b85e59b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
deps/premake/discord-rpc.lua vendored
View File

@ -3,7 +3,7 @@ discordrpc = {
}
function discordrpc.import()
links { "discord-rpc" }
links "discord-rpc"
discordrpc.includes()
end

21
src/STDInclude.hpp
View File

@ -16,16 +16,13 @@
#include <ShlObj.h>
#include <timeapi.h>
#include <shellapi.h>
#include <WinInet.h>
#include <wininet.h>
#include <d3d9.h>
#include <AclAPI.h>
#include <Psapi.h>
#include <TlHelp32.h>
#include <Shlwapi.h>
#pragma warning(push)
#pragma warning(disable: 4091)
#pragma warning(disable: 4244)
#include <DbgHelp.h>
#include <algorithm>
@ -51,8 +48,6 @@
#include <unordered_map>
#include <unordered_set>
#pragma warning(pop)
#include <d3dx9tex.h>
#pragma comment(lib, "D3dx9.lib")
@ -64,21 +59,7 @@
// Ignore the warnings
#pragma warning(push)
#pragma warning(disable: 4005)
#pragma warning(disable: 4091)
#pragma warning(disable: 4100)
#pragma warning(disable: 4244)
#pragma warning(disable: 4389)
#pragma warning(disable: 4702)
#pragma warning(disable: 4800)
#pragma warning(disable: 5054)
#pragma warning(disable: 6001)
#pragma warning(disable: 6011)
#pragma warning(disable: 6031)
#pragma warning(disable: 6255)
#pragma warning(disable: 6258)
#pragma warning(disable: 6386)
#pragma warning(disable: 6387)
#pragma warning(disable: 26812)
// Enable additional literals

2
src/Utils/Memory.cpp
View File

@ -2,7 +2,7 @@
namespace Utils
{
Utils::Memory::Allocator Memory::MemAllocator;
Memory::Allocator Memory::MemAllocator;
void* Memory::AllocateAlign(std::size_t length, std::size_t alignment)
{