From 73d53576ce9d3698ebe110be53302ca13450c8ae Mon Sep 17 00:00:00 2001
From: amzn-sj <srikkant@amazon.com>
Date: Fri, 30 Apr 2021 14:55:31 -0700
Subject: [PATCH] Fix monolithic builds

---
 Code/CryEngine/CrySystem/CPUDetect.cpp |  4 ----
 Code/LauncherUnified/StaticModules.in  | 17 -----------------
 2 files changed, 21 deletions(-)

diff --git a/Code/CryEngine/CrySystem/CPUDetect.cpp b/Code/CryEngine/CrySystem/CPUDetect.cpp
index 9af68a1854..6d924a1514 100644
--- a/Code/CryEngine/CrySystem/CPUDetect.cpp
+++ b/Code/CryEngine/CrySystem/CPUDetect.cpp
@@ -52,11 +52,7 @@
 # define cpuid(op, eax, ebx, ecx, edx) __asm__("cpuid" : "=a" (eax), "=b" (ebx), "=c" (ecx), "=d" (edx) : "a" (op) : "cc");
 #endif
 
-#if defined(AZ_MONOLITHIC_BUILD)
-extern int g_CpuFlags;
-#else
 int g_CpuFlags;
-#endif
 
 struct SAutoMaxPriority
 {
diff --git a/Code/LauncherUnified/StaticModules.in b/Code/LauncherUnified/StaticModules.in
index 629973bdf4..03b22b076a 100644
--- a/Code/LauncherUnified/StaticModules.in
+++ b/Code/LauncherUnified/StaticModules.in
@@ -20,15 +20,6 @@
 
 #include <AzCore/std/containers/vector.h>
 
-#define DECLARE_CRYREGISTER_SINGLETON_CLASS(implclassname) \
-    void* Get##implclassname##Factory();
-
-DECLARE_CRYREGISTER_SINGLETON_CLASS(CEngineModule_Cry3DEngine)
-DECLARE_CRYREGISTER_SINGLETON_CLASS(CEngineModule_CryFont)
-DECLARE_CRYREGISTER_SINGLETON_CLASS(CEngineModule_CryRenderer)
-
-#undef DECLARE_CRYREGISTER_SINGLETON_CLASS
-
 namespace AZ
 {
     class Module;
@@ -39,14 +30,6 @@ ${extern_module_declarations}
 extern "C" void CreateStaticModules(AZStd::vector<AZ::Module*>& modulesOut)
 {
 ${module_invocations}
-    // Call methods to avoid symbol striping
-#define NON_STRIPPING_CALL(Module) \
-    AZ_UNUSED(Get##Module##Factory())
-
-    NON_STRIPPING_CALL(CEngineModule_Cry3DEngine);
-    NON_STRIPPING_CALL(CEngineModule_CryFont);
-    NON_STRIPPING_CALL(CEngineModule_CryRenderer);
-#undef NON_STRIPPING_CALL
 }
 
 #endif // AZ_MONOLITHIC_BUILD