removed all defines which are defined in the CMakeLists.txt

src/Discord/connection_win.cpp

@@ -1,6 +1,5 @@
 #include "connection.h"
 
-#define WIN32_LEAN_AND_MEAN
 #define NOMCX
 #define NOSERVICE
 #define NOIME

src/Discord/discord_register_win.cpp

@@ -1,7 +1,6 @@
 #include "discord_rpc.h"
 #include "discord_register.h"
 
-#define WIN32_LEAN_AND_MEAN
 #define NOMCX
 #define NOSERVICE
 #define NOIME

src/EterBase/StdAfx.h

@@ -1,10 +1,5 @@
 #pragma once
 
-#define WIN32_LEAN_AND_MEAN		// Exclude rarely-used stuff from Windows headers
-#ifndef _CRT_SECURE_NO_WARNINGS
-#define _CRT_SECURE_NO_WARNINGS
-#endif
-
 #pragma warning(disable:4710)	// not inlined
 #pragma warning(disable:4786)	// character 255 넘어가는거 끄기
 #pragma warning(disable:4244)	// type conversion possible lose of data

src/EterBase/Utils.h

@@ -27,12 +27,6 @@
 
 #define AssertLog(str)	TraceError(str); assert(!str)
 
-#ifndef MAKEFOURCC
-#define MAKEFOURCC(ch0, ch1, ch2, ch3)                                      \
-				((DWORD)(BYTE) (ch0       ) | ((DWORD)(BYTE) (ch1) <<  8) | \
-				((DWORD)(BYTE) (ch2) << 16) | ((DWORD)(BYTE) (ch3) << 24))
-#endif // defined(MAKEFOURCC)
-
 #ifndef IS_SET
 #define IS_SET(flag,bit)                ((flag) & (bit))
 #endif

src/EterImageLib/DXTCImage.cpp

@@ -51,11 +51,6 @@ struct Color565
 
 /////////////////////////////////////
 // should be in ddraw.h
-#ifndef MAKEFOURCC
-#define MAKEFOURCC(ch0, ch1, ch2, ch3)                                      \
-				((DWORD)(BYTE) (ch0       ) | ((DWORD)(BYTE) (ch1) <<  8) | \
-				((DWORD)(BYTE) (ch2) << 16) | ((DWORD)(BYTE) (ch3) << 24))
-#endif // defined(MAKEFOURCC)
 
 CDXTCImage::CDXTCImage()
 {

src/EterImageLib/StdAfx.h

@@ -12,8 +12,6 @@
 
 #pragma warning(disable:4786)
 
-#define WIN32_LEAN_AND_MEAN		// Exclude rarely-used stuff from Windows headers
-
 //#include <crtdbg.h>
 
 #include <windows.h>

src/EterLib/StdAfx.h

@@ -1,12 +1,5 @@
 #pragma once
 
-#ifndef WIN32_LEAN_AND_MEAN
-#define WIN32_LEAN_AND_MEAN
-#endif	
-#ifndef _CRT_SECURE_NO_WARNINGS
-#define _CRT_SECURE_NO_WARNINGS
-#endif
-
 #define _WIN32_DCOM
 
 #pragma warning(disable:4710)	// not inlined

src/EterLocale/StdAfx.h

@@ -5,8 +5,6 @@
 
 #pragma once
 
-#define WIN32_LEAN_AND_MEAN		// Exclude rarely-used stuff from Windows headers
-
 #include <windows.h>
 #include <assert.h>
 

src/EterPack/EterPack.h

@@ -4,13 +4,7 @@
 #include <list>
 #include <unordered_map>
 
-#include "../EterBase/MappedFile.h"
+#include "EterBase/MappedFile.h"
-
-#ifndef MAKEFOURCC
-#define MAKEFOURCC(ch0, ch1, ch2, ch3)                                                  \
-                        ((DWORD)(BYTE) (ch0       ) | ((DWORD)(BYTE) (ch1) <<  8) |     \
-                        ((DWORD)(BYTE) (ch2) << 16) | ((DWORD)(BYTE) (ch3) << 24))
-#endif
 
 
 //#define  CHECKSUM_CHECK_MD5

src/EterPack/StdAfx.h

@@ -1,7 +1,5 @@
 #pragma once
 
-#define WIN32_LEAN_AND_MEAN		// Exclude rarely-used stuff from Windows headers
-
 //#include <crtdbg.h>
 #include <windows.h>
 #include <assert.h>

src/PRTerrainLib/StdAfx.h

@@ -10,8 +10,6 @@
 #pragma once
 #endif // _MSC_VER > 1000
 
-#define WIN32_LEAN_AND_MEAN		// Exclude rarely-used stuff from Windows headers
-
 // TODO: reference additional headers your program requires here
 #pragma warning(disable:4702)
 

src/SpeedTreeLib/StdAfx.h

@@ -1,7 +1,5 @@
 #pragma once
 
-#define WIN32_LEAN_AND_MEAN		// Exclude rarely-used stuff from Windows headers
-
 #include <assert.h>
 #include "../UserInterface/Locale_inc.h"
 //#include <crtdbg.h>

src/SphereLib/StdAfx.h

@@ -1,6 +1,5 @@
 #pragma once
 
-#define WIN32_LEAN_AND_MEAN		// Exclude rarely-used stuff from Windows headers
 //#define SPHERELIB_STRICT
 //#include <crtdbg.h>