Builds Windows nounity and unity

Builds Linux nounity and unity Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-07-16 13:13:59 -07:00
parent 032a35e495
commit 7c9653087d
45 changed files with 77 additions and 146 deletions
@@ -47,8 +47,7 @@

 #include <signal.h>

-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
+#include <AzCore/PlatformIncl.h>

 //-----------------------------------------------------------------------------------------------------

@@ -8,13 +8,9 @@

 #pragma once

-#ifndef WIN32_LEAN_AND_MEAN
-#define WIN32_LEAN_AND_MEAN
-#endif
-
-#include <windows.h>
-#include <process.h>
+#include <AzCore/PlatformIncl.h>
 #include <AzCore/std/parallel/semaphore.h> // for CreateSemaphore
+
 struct SThreadNameDesc
 {
    DWORD dwType;
@@ -13,32 +13,6 @@
 #define CRYINCLUDE_CRYCOMMON_CRYWINDOWS_H
 #pragma once

-
-#if defined(WIN32) || defined(WIN64)
-
-#ifndef FULL_WINDOWS_HEADER
-    #define WIN32_LEAN_AND_MEAN
-#endif
-
-#include <windows.h>
-
-#undef GetCommandLine
-#undef GetObject
-#undef PlaySound
-#undef GetClassName
-#undef DrawText
-#undef GetCharWidth
-#undef GetUserName
-#undef LoadLibrary
-#undef RegisterClass
-
-#undef min
-#undef max
-
-#undef NOMINMAX
-#undef WIN32_LEAN_AND_MEAN
-#undef FULL_WINDOWS_HEADER
-
-#endif
+#include <AzCore/PlatformIncl.h>

 #endif // CRYINCLUDE_CRYCOMMON_CRYWINDOWS_H
@@ -8,12 +8,10 @@

 #ifndef _CRY_WINDOW_MESSAGE_HANDLER_H_
 #define _CRY_WINDOW_MESSAGE_HANDLER_H_
-#include "platform.h"
+
 #if defined(WIN32)
-#ifndef WIN32_LEAN_AND_MEAN
-#define WIN32_LEAN_AND_MEAN
-#endif
-#include <windows.h>
+#include "platform.h"
+#include <AzCore/PlatformIncl.h>

 // Summary:
 //      Window message handler for Windows OS