Add NOMINMAX for MSVC and use <algorithm>

This commit is contained in:
scribam 2020-01-23 23:48:29 +01:00
parent 39af255335
commit 6dd35cc811
5 changed files with 4 additions and 8 deletions

View File

@ -162,11 +162,6 @@ ROM board internal layouts:
*/ */
#include "awcartridge.h" #include "awcartridge.h"
#include "awave_regs.h" #include "awave_regs.h"
#ifdef _MSC_VER
#undef min
#undef max
#include <algorithm>
#endif
u32 AWCartridge::ReadMem(u32 address, u32 size) { u32 AWCartridge::ReadMem(u32 address, u32 size) {
verify(size != 1); verify(size != 1);

View File

@ -1,5 +1,6 @@
#pragma once #pragma once
#include <algorithm>
#include <string> #include <string>
#include "types.h" #include "types.h"

View File

@ -17,10 +17,7 @@
#include "reios.h" #include "reios.h"
#include "imgread/common.h" #include "imgread/common.h"
#ifdef _MSC_VER
#undef min
#include <algorithm> #include <algorithm>
#endif
#define SWAP32(a) ((((a) & 0xff) << 24) | (((a) & 0xff00) << 8) | (((a) >> 8) & 0xff00) | (((a) >> 24) & 0xff)) #define SWAP32(a) ((((a) & 0xff) << 24) | (((a) & 0xff00) << 8) | (((a) >> 8) & 0xff00) | (((a) >> 24) & 0xff))

View File

@ -1,3 +1,4 @@
#include <algorithm>
#include <cstring> #include <cstring>
#include <vector> #include <vector>
#include <sys/types.h> #include <sys/types.h>

View File

@ -54,6 +54,8 @@
#endif #endif
#define _CRT_SECURE_NO_DEPRECATE #define _CRT_SECURE_NO_DEPRECATE
#define NOMINMAX
//Do not complain when i use enum::member //Do not complain when i use enum::member
#pragma warning( disable : 4482) #pragma warning( disable : 4482)