From 67cabc3c895dc1e035724bc9b5d357976e1c1e48 Mon Sep 17 00:00:00 2001 From: d1str4ught <> Date: Wed, 27 Aug 2025 12:48:33 +0200 Subject: [PATCH] removed all defines which are defined in the CMakeLists.txt --- src/Discord/connection_win.cpp | 1 - src/Discord/discord_register_win.cpp | 1 - src/EterBase/StdAfx.h | 5 ----- src/EterBase/Utils.h | 6 ------ src/EterImageLib/DXTCImage.cpp | 5 ----- src/EterImageLib/StdAfx.h | 2 -- src/EterLib/StdAfx.h | 7 ------- src/EterLocale/StdAfx.h | 2 -- src/EterPack/EterPack.h | 8 +------- src/EterPack/StdAfx.h | 2 -- src/PRTerrainLib/StdAfx.h | 2 -- src/SpeedTreeLib/StdAfx.h | 2 -- src/SphereLib/StdAfx.h | 1 - 13 files changed, 1 insertion(+), 43 deletions(-) diff --git a/src/Discord/connection_win.cpp b/src/Discord/connection_win.cpp index 2dd2750..d9428ca 100644 --- a/src/Discord/connection_win.cpp +++ b/src/Discord/connection_win.cpp @@ -1,6 +1,5 @@ #include "connection.h" -#define WIN32_LEAN_AND_MEAN #define NOMCX #define NOSERVICE #define NOIME diff --git a/src/Discord/discord_register_win.cpp b/src/Discord/discord_register_win.cpp index 0b1c4a1..928a3b7 100644 --- a/src/Discord/discord_register_win.cpp +++ b/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 diff --git a/src/EterBase/StdAfx.h b/src/EterBase/StdAfx.h index 0d15410..be58798 100644 --- a/src/EterBase/StdAfx.h +++ b/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 diff --git a/src/EterBase/Utils.h b/src/EterBase/Utils.h index 518b290..4723730 100644 --- a/src/EterBase/Utils.h +++ b/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 diff --git a/src/EterImageLib/DXTCImage.cpp b/src/EterImageLib/DXTCImage.cpp index d8ed0c2..479d116 100644 --- a/src/EterImageLib/DXTCImage.cpp +++ b/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() { diff --git a/src/EterImageLib/StdAfx.h b/src/EterImageLib/StdAfx.h index 9db5822..128c8ea 100644 --- a/src/EterImageLib/StdAfx.h +++ b/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 #include diff --git a/src/EterLib/StdAfx.h b/src/EterLib/StdAfx.h index 485e790..e065456 100644 --- a/src/EterLib/StdAfx.h +++ b/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 diff --git a/src/EterLocale/StdAfx.h b/src/EterLocale/StdAfx.h index cbc4d1f..f2ba192 100644 --- a/src/EterLocale/StdAfx.h +++ b/src/EterLocale/StdAfx.h @@ -5,8 +5,6 @@ #pragma once -#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers - #include #include diff --git a/src/EterPack/EterPack.h b/src/EterPack/EterPack.h index 502c747..5c5ff31 100644 --- a/src/EterPack/EterPack.h +++ b/src/EterPack/EterPack.h @@ -4,13 +4,7 @@ #include #include -#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 +#include "EterBase/MappedFile.h" //#define CHECKSUM_CHECK_MD5 diff --git a/src/EterPack/StdAfx.h b/src/EterPack/StdAfx.h index eea9bac..a8fa6e9 100644 --- a/src/EterPack/StdAfx.h +++ b/src/EterPack/StdAfx.h @@ -1,7 +1,5 @@ #pragma once -#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers - //#include #include #include diff --git a/src/PRTerrainLib/StdAfx.h b/src/PRTerrainLib/StdAfx.h index bdc2032..b6db9cb 100644 --- a/src/PRTerrainLib/StdAfx.h +++ b/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) diff --git a/src/SpeedTreeLib/StdAfx.h b/src/SpeedTreeLib/StdAfx.h index 94d8896..8d8eae4 100644 --- a/src/SpeedTreeLib/StdAfx.h +++ b/src/SpeedTreeLib/StdAfx.h @@ -1,7 +1,5 @@ #pragma once -#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers - #include #include "../UserInterface/Locale_inc.h" //#include diff --git a/src/SphereLib/StdAfx.h b/src/SphereLib/StdAfx.h index a5eb32b..862a1da 100644 --- a/src/SphereLib/StdAfx.h +++ b/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