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
@@ -15,6 +15,7 @@
 #include <AzToolsFramework/Entity/SliceEditorEntityOwnershipServiceBus.h>
 #include <AzCore/Component/Component.h>
 #include <TimeValue.h>
+#include <IEditor.h>
 #endif

 class CClouds;
@@ -30,6 +30,7 @@ struct IRenderAuxGeom;
 struct IIconManager;
 class CDisplaySettings;
 class CCamera;
+class QPoint;

 enum DisplayFlags
 {
@@ -10,6 +10,7 @@
 #if !defined(Q_MOC_RUN)
 #include <AzCore/PlatformIncl.h>
 #include <QMainWindow>
+#include <AzCore/Math/Guid.h>
 #endif

 namespace AzToolsFramework
@@ -19,6 +19,7 @@
 #include <AssetImporterDocument.h>
 #include <AzCore/std/smart_ptr/shared_ptr.h>
 #include <AzCore/std/smart_ptr/unique_ptr.h>
+#include <AzCore/Math/Guid.h>
 #endif

 namespace AZStd
@@ -14,10 +14,7 @@
 #include "AssetImporterPlugin.h"


-#if defined(AZ_PLATFORM_WINDOWS)
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#endif
+#include <AzCore/PlatformIncl.h>
 #include <AzCore/Memory/SystemAllocator.h>

 PLUGIN_API IPlugin* CreatePluginInstance(PLUGIN_INIT_PARAM* pInitParam)
@@ -158,7 +158,7 @@ namespace DrawingPrimitives


        char format[16] = "";
-        sprintf_s(format, "%%.%df", rulerPrecision);
+        azsprintf(format, "%%.%df", rulerPrecision);

        const int height = options.m_rect.height();
        const int top = options.m_rect.top();
@@ -13,7 +13,7 @@
 #define CRYINCLUDE_EDITOR_UTIL_EDITORUTILS_H
 #pragma once

-
+#include <CryCommon/platform.h>
 #include <IXml.h>
 #include "Util/FileUtil.h"
 #include <Cry_Color.h>
@@ -14,6 +14,7 @@
 #pragma once

 #include <Include/EditorCoreAPI.h>
+#include <CryCommon/ISystem.h>

 //! Derive from this class to get reference counting in your class.
 class EDITOR_CORE_API CRefCountBase
@@ -14,11 +14,7 @@
 #include <cctype>
 #include <algorithm>

-#if defined(AZ_PLATFORM_WINDOWS)
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>   // WideCharToMultibyte(), CP_UTF8, etc.
-#endif
-
+#include <AzCore/PlatformIncl.h> // WideCharToMultibyte(), CP_UTF8, etc.
 #include <AzCore/Casting/numeric_cast.h>

 static inline char ToLower(const char c)
@@ -8,3 +8,16 @@
 #pragma once

 #include <unistd.h>
+
+#define __STDC_FORMAT_MACROS
+#include <inttypes.h>
+
+// types like AZ::u64 require an usigned long long, but inttypes.h has it as unsigned long
+#undef PRIX64
+#undef PRIx64
+#undef PRId64
+#undef PRIu64
+#define PRIX64 "llX"
+#define PRIx64 "llx"
+#define PRId64 "lld"
+#define PRIu64 "llu"
@@ -7,6 +7,7 @@
 #pragma once

 #include "time_UnixLike.h"
+#include <AzCore/std/chrono/clocks.h>

 /**
 * This file is to be included from the semaphore.h only. It should NOT be included by the user.
@@ -4,10 +4,8 @@
 * SPDX-License-Identifier: Apache-2.0 OR MIT
 *
 */
-#include <stdlib.h>
-#include <windows.h>
-#include <sysinfoapi.h>
-#include <fileapi.h>
+
+#include <AzCore/PlatformIncl.h>

 #include <AzCore/IO/Path/Path.h>
 #include <AzCore/std/functional.h>
@@ -214,9 +214,7 @@ namespace LegacyFramework
        /** (Windows) retrieves the main module of the executable.
        * This is always going to be the main executable except in the situation where the framework may be running as a DLL belonging to another process or program.
        */
-#ifdef AZ_PLATFORM_WINDOWS
-        virtual HMODULE GetMainModule() = 0;
-#endif
+        virtual void* GetMainModule() = 0;

        virtual const char* GetApplicationName() = 0;
        virtual const char* GetApplicationModule() = 0;
@@ -57,7 +57,7 @@ AZ_POP_DISABLE_OVERRIDE_WARNING
 namespace LegacyFramework
 {
    ApplicationDesc::ApplicationDesc(const char* name, int argc, char** argv)
-        : m_applicationModule(NULL)
+        : m_applicationModule(nullptr)
        , m_enableGridmate(true)
        , m_enablePerforce(true)
        , m_enableGUI(true)
@@ -70,7 +70,7 @@ namespace LegacyFramework
        m_applicationName[0] = 0;
        if (name)
        {
-            azstrcpy(m_applicationName, _MAX_PATH, name);
+            azstrcpy(m_applicationName, AZ_MAX_PATH_LEN, name);
        }
    }

@@ -90,7 +90,7 @@ namespace LegacyFramework
        m_enableGUI = other.m_enableGUI;
        m_enableGridmate = other.m_enableGridmate;
        m_enablePerforce = other.m_enablePerforce;
-        azstrcpy(m_applicationName, _MAX_PATH, other.m_applicationName);
+        azstrcpy(m_applicationName, AZ_MAX_PATH_LEN, other.m_applicationName);
        m_enableProjectManager = other.m_enableProjectManager;
        m_shouldRunAssetProcessor = other.m_shouldRunAssetProcessor;
        m_saveUserSettings = other.m_saveUserSettings;
@@ -104,12 +104,12 @@ namespace LegacyFramework
        m_isPrimary = true;
        m_desiredExitCode = 0;
        m_abortRequested = false;
-        m_applicationEntity = NULL;
-        m_ptrSystemEntity = NULL;
+        m_applicationEntity = nullptr;
+        m_ptrSystemEntity = nullptr;
        m_applicationModule[0] = 0;
    }

-    HMODULE Application::GetMainModule()
+    void* Application::GetMainModule()
    {
        return m_desc.m_applicationModule;
    }
@@ -371,7 +371,7 @@ namespace LegacyFramework

        applicationFilePath.append("_app.xml");

-        AZ_Assert(applicationFilePath.size() <= _MAX_PATH, "Application path longer than expected");
+        AZ_Assert(applicationFilePath.size() <= AZ_MAX_PATH_LEN, "Application path longer than expected");
        qstrcpy(m_applicationFilePath, applicationFilePath.c_str());

        // load all application entities, if present:
@@ -24,7 +24,7 @@ namespace LegacyFramework
 {
    struct ApplicationDesc
    {
-        HMODULE m_applicationModule;  // only necessary if you want to attach your application as a DLL plugin to another application, hosting it
+        void* m_applicationModule;  // only necessary if you want to attach your application as a DLL plugin to another application, hosting it
        bool m_enableGUI; // false if you want none of the QT or GUI functionality to exist.  You cannot use project manager if you do this.
        bool m_enableGridmate; // false if you want to not activate the network communications module.
        bool m_enablePerforce; // false if you want to not activate perforce SCM integration.  note that this will eventually become a plugin anyway
@@ -35,7 +35,7 @@ namespace LegacyFramework
        int m_argc;
        char** m_argv;

-        char m_applicationName[_MAX_PATH];
+        char m_applicationName[AZ_MAX_PATH_LEN];

        ApplicationDesc(const char* name = "Application", int argc = 0, char** argv = nullptr);
        ApplicationDesc(const ApplicationDesc& other);
@@ -65,7 +65,7 @@ namespace LegacyFramework
        virtual bool IsRunningInGUIMode() { return m_desc.m_enableGUI; }
        virtual bool RequiresGameProject() { return m_desc.m_enableProjectManager; }
        virtual bool ShouldRunAssetProcessor() { return m_desc.m_shouldRunAssetProcessor; }
-        virtual HMODULE GetMainModule();
+        virtual void* GetMainModule();
        virtual const char* GetApplicationName();
        virtual const char* GetApplicationModule();
        virtual const char* GetApplicationDirectory();
@@ -131,11 +131,11 @@ namespace LegacyFramework
        void CreateApplicationComponent();
        void SaveApplicationEntity();

-        char m_applicationModule[_MAX_PATH];
+        char m_applicationModule[AZ_MAX_PATH_LEN];
        int m_desiredExitCode;
        bool m_isPrimary;
        volatile bool m_abortRequested; // if you CTRL+C in a console app, this becomes true.  its up to you to check...
-        char m_applicationFilePath[_MAX_PATH];
+        char m_applicationFilePath[AZ_MAX_PATH_LEN];
        ApplicationDesc m_desc;
        AzFramework::CommandLine* m_ptrCommandLineParser;
    };
@@ -48,32 +48,6 @@ namespace AzToolsFramework
        };
    }

-    static QWindow* windowForWidget(const QWidget* widget)
-    {
-        QWindow* window = widget->windowHandle();
-        if (window)
-        {
-            return window;
-        }
-        const QWidget* nativeParent = widget->nativeParentWidget();
-        if (nativeParent)
-        {
-            return nativeParent->windowHandle();
-        }
-        return 0;
-    }
-
-    HWND getHWNDForWidget(const QWidget* widget)
-    {
-        QWindow* window = windowForWidget(widget);
-        if (window && window->handle())
-        {
-            QPlatformNativeInterface* itf = QGuiApplication::platformNativeInterface();
-            return static_cast<HWND>(itf->nativeResourceForWindow(QByteArrayLiteral("handle"), window));
-        }
-        return 0;
-    }
-
    bool GetOverwritePromptResult(QWidget* pParentWidget, const char* assetNameToOvewrite)
    {
        OverwritePromptDialog dlg(pParentWidget);
@@ -51,9 +51,6 @@ namespace AzToolsFramework
    // ------------------------------------------------ DESCRIPTOR STRUCTS ----------------------------------------------------
    // ------------------------------------------------------------------------------------------------------------------------

-    // helper function:
-    HWND getHWNDForWidget(const QWidget* widget);
-
    struct HotkeyDescription
    {
        enum Scope
@@ -7,6 +7,7 @@

 #pragma once

+#include <AzCore/Memory/Memory.h>
 #include <AzCore/std/function/function_template.h>
 #include <AzCore/std/containers/unordered_map.h>
 #include <QPointer>
@@ -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
@@ -48,9 +48,7 @@
 #endif

 #ifdef WIN32
-#define WIN32_LEAN_AND_MEAN
-// If app hasn't chosen, set to work with Windows 98, Windows Me, Windows 2000, Windows XP and beyond
-#include <windows.h>
+#include <AzCore/PlatformIncl.h>

 LRESULT WINAPI WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 {
@@ -14,7 +14,7 @@
 #ifdef WIN32

 #include "System.h"
-#include <windows.h>
+#include <AzCore/PlatformIncl.h>
 #include <tchar.h>
 #include "errorrep.h"
 #include "ISystem.h"
@@ -699,7 +699,7 @@ Please note that only those seed files will get updated that are active for your
                {
                    report.append(AZStd::string::format(
                        "SOURCEID: %" PRId64 ", CURRENT PATH: %s, NEW PATH: %s, CURRENT GUID: %s, NEW GUID: %s\n",
-                        static_cast<int64_t>(relocationInfo.m_sourceEntry.m_sourceID),
+                        relocationInfo.m_sourceEntry.m_sourceID,
                        relocationInfo.m_oldRelativePath.c_str(),
                        relocationInfo.m_newRelativePath.c_str(),
                        relocationInfo.m_sourceEntry.m_sourceGuid.ToString<AZStd::string>().c_str(),
@@ -709,7 +709,7 @@ Please note that only those seed files will get updated that are active for your
                {
                    report.append(AZStd::string::format(
                        "SOURCEID: %" PRId64 ", CURRENT PATH: %s, CURRENT GUID: %s\n",
-                        static_cast<int64_t>(relocationInfo.m_sourceEntry.m_sourceID),
+                        relocationInfo.m_sourceEntry.m_sourceID,
                        relocationInfo.m_oldRelativePath.c_str(),
                        relocationInfo.m_sourceEntry.m_sourceGuid.ToString<AZStd::string>().c_str()));
                }
@@ -1025,7 +1025,7 @@ namespace AssetUtilities

    AZStd::string ComputeJobLogFileName(const AzToolsFramework::AssetSystem::JobInfo& jobInfo)
    {
-        return AZStd::string::format("%s-%u-%" PRIu64 ".log", jobInfo.m_sourceFile.c_str(), jobInfo.GetHash(), static_cast<uint64_t>(jobInfo.m_jobRunKey));
+        return AZStd::string::format("%s-%u-%" PRIu64 ".log", jobInfo.m_sourceFile.c_str(), jobInfo.GetHash(), jobInfo.m_jobRunKey);
    }

    AZStd::string ComputeJobLogFileName(const AssetBuilderSDK::CreateJobsRequest& createJobsRequest)
@@ -1245,7 +1245,7 @@ namespace AssetUtilities
        return 0;
    }

-    std::uint64_t AdjustTimestamp(QDateTime timestamp)
+    AZ::u64 AdjustTimestamp(QDateTime timestamp)
    {
        timestamp = timestamp.toUTC();

@@ -1280,7 +1280,7 @@ namespace AssetUtilities
        else
        {
            bool useHash = ShouldUseFileHashing();
-            std::uint64_t fileIdentifier;
+            AZ::u64 fileIdentifier;
            if(useHash)
            {
                fileIdentifier = GetFileHash(absolutePath.c_str());
@@ -1294,13 +1294,13 @@ namespace AssetUtilities
            // so we add the size of it too.
            // its also possible that it moved to a different file with the same modtime/hash AND size,
            // but with a different name.  So we add that too.
-            return AZStd::string::format("%" PRIX64 ":%" PRIu64 ":%s", fileIdentifier, aznumeric_cast<uint64_t>(fileStateInfo.m_fileSize), nameToUse.c_str());
+            return AZStd::string::format("%" PRIX64 ":%" PRIu64 ":%s", fileIdentifier, fileStateInfo.m_fileSize, nameToUse.c_str());
        }
    }

    AZStd::string ComputeJobLogFileName(const AssetProcessor::JobEntry& jobEntry)
    {
-        return AZStd::string::format("%s-%u-%" PRIu64 ".log", jobEntry.m_databaseSourceName.toUtf8().constData(), jobEntry.GetHash(), static_cast<uint64_t>(jobEntry.m_jobRunKey));
+        return AZStd::string::format("%s-%u-%" PRIu64 ".log", jobEntry.m_databaseSourceName.toUtf8().constData(), jobEntry.GetHash(), jobEntry.m_jobRunKey);
    }

    bool CreateTempRootFolder(QString startFolder, QDir& tempRoot)
@@ -240,7 +240,7 @@ namespace AssetUtilities
    inline constexpr AZ::u64 FileHashBufferSize = 1024 * 64;

    //! Adjusts a timestamp to fix timezone settings and account for any precision adjustment needed
-    std::uint64_t AdjustTimestamp(QDateTime timestamp);
+    AZ::u64 AdjustTimestamp(QDateTime timestamp);

    // Generates a fingerprint string based on details of the file, will return the string "0" if the file does not exist.
    // note that the 'name to use' can be blank, but it used to disambiguate between files that have the same
@@ -7,12 +7,11 @@

 // LY Editor Crashpad Upload Handler Extension

+#include <AzCore/PlatformIncl.h>
 #include <handler/handler_main.h>
 #include <tools/tool_support.h>
 #include <Uploader/CrashUploader.h>

-#include <windows.h>
-
 namespace
 {
    int HandlerMain(int argc, char* argv[])
@@ -8,6 +8,7 @@

 #pragma once

+#include <AzCore/PlatformIncl.h>
 #include <client/crash_report_database.h>
 #include <util/net/http_multipart_builder.h>
 #include <util/net/http_transport.h>
@@ -5,7 +5,7 @@
 *
 */

-#include <AzCore/PlatformDef.h>
+#include <AzCore/PlatformIncl.h>
 AZ_PUSH_DISABLE_WARNING(4244 4251, "-Wunknown-warning-option")
 #include <QtGui>
 #include <QtWidgets/QMenu>
@@ -13,8 +13,7 @@ AZ_PUSH_DISABLE_WARNING(4244 4251, "-Wunknown-warning-option")
 AZ_POP_DISABLE_WARNING

 #ifdef AZ_PLATFORM_WINDOWS
-// windows include must be first so we get the full version (AZCore bring the trimmed one)
-#include <Windows.h>
+#include <AzCore/PlatformIncl.h>
 #else
 #include <signal.h>
 #endif
@@ -23,10 +23,7 @@ AZ_POP_DISABLE_WARNING
 #include <AzCore/Debug/TraceMessageBus.h>
 #include <AzCore/IO/SystemFile.h>
 #include <AzCore/Component/TickBus.h>
-
-#if defined(AZ_PLATFORM_WINDOWS)
-#include <windows.h>
-#endif
+#include <AzCore/PlatformIncl.h>
 #endif

 namespace AZ
@@ -7,7 +7,7 @@

 // windows include must be first so we get the full version (AZCore bring the trimmed one)
 #ifdef _WIN32
-#include <Windows.h>
+#include <AzCore/PlatformIncl.h>
 #include <winnls.h>
 #include <shobjidl.h>
 #include <objbase.h>
@@ -13,10 +13,8 @@
 #include <AzToolsFramework/UI/LegacyFramework/Core/EditorContextBus.h>
 #include <AzCore/IO/SystemFile.h>
 #include <AzToolsFramework/SourceControl/SourceControlAPI.h>
-
-#if defined(AZ_PLATFORM_WINDOWS)
-#include <windows.h>
-#endif
+#include <AzCore/PlatformIncl.h>
+#include <CryCommon/platform.h>

 namespace LUAEditor
 {
@@ -6,6 +6,8 @@
 */
 #pragma once

+#include <AzCore/base.h>
+
 namespace AssetMemoryAnalyzer
 {
    namespace Data
@@ -13,6 +13,7 @@
 #pragma once
 #include <math.h>
 #include <ImageProcessing_Traits_Platform.h>
+#include <AzCore/Math/MathUtils.h>

 /* ####################################################################################################################
 */
@@ -6,7 +6,7 @@
 */

 #include <AzCore/std/string/string.h>
-#include <windows.h>
+#include <AzCore/PlatformIncl.h>

 namespace LuxCoreUI
 {
@@ -6,5 +6,4 @@
 */
 #pragma once

-#include <Atom_RHI_Vulkan_inux.h>
-
+#include <Atom_RHI_Vulkan_Linux.h>
@@ -6,13 +6,4 @@
 */
 #pragma once

-#ifndef WIN32_LEAN_AND_MEAN
-    #define WIN32_LEAN_AND_MEAN 1
-    #define LEAN_AND_MEAN_DEFINED 1
-#endif
-
-#include <windows.h>
-
-#if defined(LEAN_AND_MEAN_DEFINED)
-    #undef WIN32_LEAN_AND_MEAN
-#endif
+#include <AzCore/PlatformIncl.h>
@@ -6,7 +6,7 @@
 */
 #pragma once

-#include <windows.h>
+#include <AzCore/PlatformIncl.h>
 #include <AzFramework/Input/Buses/Notifications/RawInputNotificationBus_Windows.h>
 #include <AzFramework/Windowing/WindowBus.h>

@@ -63,5 +63,3 @@ namespace MaterialEditor
        return false;
    }
 } // namespace MaterialEditor
-
-#include <Source/Viewport/moc_MaterialViewportWidget.cpp>
@@ -6,7 +6,7 @@
 */
 #pragma once

-#include <windows.h>
+#include <AzCore/PlatformIncl.h>
 #include <AzFramework/Input/Buses/Notifications/RawInputNotificationBus_Windows.h>
 #include <AzFramework/Windowing/WindowBus.h>

@@ -36,6 +36,7 @@
 #include <AzToolsFramework/Slice/SliceUtilities.h>
 #include <AzToolsFramework/API/EditorAssetSystemAPI.h>
 #include "AzFramework/Asset/SimpleAsset.h"
+#include <AzCore/PlatformIncl.h>

 namespace SliceBuilder
 {
@@ -42,7 +42,7 @@ CUiAVSequenceProps::~CUiAVSequenceProps()
 }

 // CUiAVSequenceProps message handlers
-BOOL CUiAVSequenceProps::OnInitDialog()
+bool CUiAVSequenceProps::OnInitDialog()
 {
    QString name = m_pSequence->GetName();
    ui->NAME->setText(name);
@@ -74,7 +74,7 @@ BOOL CUiAVSequenceProps::OnInitDialog()
        ui->ORT_ONCE->setChecked(true);
    }

-    return TRUE;  // return TRUE unless you set the focus to a control
+    return true;  // return TRUE unless you set the focus to a control
    // EXCEPTION: OCX Property Pages should return FALSE
 }

@@ -32,7 +32,7 @@ public:
 private:
    CUiAnimViewSequence* m_pSequence;

-    virtual BOOL OnInitDialog();
+    virtual bool OnInitDialog();
    virtual void OnOK();

    void MoveScaleKeys();
@@ -10,7 +10,7 @@
 #include <AzCore/IO/SystemFile.h>
 #include <AzCore/std/string/conversions.h>

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

 ////////////////////////////////////////////////////////////////////////////////////////////////////