Several build fixes

This commit is contained in:
Esteban Papp
2021-08-12 16:42:18 -07:00
committed by GitHub
parent 48503679c4
commit 8f05c7aa2f
12 changed files with 27 additions and 5 deletions
@@ -34,7 +34,7 @@ namespace AzFramework
bool GetFullScreenState() const override;
void SetFullScreenState(bool fullScreenState) override;
bool CanToggleFullScreenState() const override { return true; }
uint32_t GetMainDisplayRefreshRate() const override;
uint32_t GetMainDisplayRefreshRate() const;
private:
static NSWindowStyleMask ConvertToNSWindowStyleMask(const WindowStyleMasks& styleMasks);
@@ -27,7 +27,7 @@ namespace AzFramework
const WindowGeometry& geometry,
const WindowStyleMasks& styleMasks) override;
NativeWindowHandle GetWindowHandle() const override;
uint32_t GetMainDisplayRefreshRate() const override;
uint32_t GetMainDisplayRefreshRate() const;
private:
UIWindow* m_nativeWindow;
@@ -7,6 +7,7 @@
*/
#include <unistd.h>
#include <AzCore/std/string/string.h>
namespace GridMate
{
@@ -7,6 +7,7 @@
*/
#include <unistd.h>
#include <AzCore/std/string/string.h>
namespace GridMate
{
@@ -10,6 +10,7 @@
#include <O3DEApplication_Mac.h>
#include <../Common/Apple/Launcher_Apple.h>
#include <../Common/UnixLike/Launcher_UnixLike.h>
#include <AzCore/Math/Vector2.h>
#if AZ_TESTS_ENABLED
@@ -9,6 +9,7 @@
#include <CryCommon/CryLibrary.h>
#include <AzCore/Math/Vector2.h>
#include <AzCore/Memory/SystemAllocator.h>
int APIENTRY WinMain([[maybe_unused]] HINSTANCE hInstance, [[maybe_unused]] HINSTANCE hPrevInstance, [[maybe_unused]] LPSTR lpCmdLine, [[maybe_unused]] int nCmdShow)
{
+15
View File
@@ -226,6 +226,21 @@ typedef uint64 __uint64;
#define _PTRDIFF_T_DEFINED 1
typedef union _LARGE_INTEGER
{
struct
{
DWORD LowPart;
LONG HighPart;
};
struct
{
DWORD LowPart;
LONG HighPart;
} u;
long long QuadPart;
} LARGE_INTEGER;
#define _A_RDONLY (0x01) /* Read only file */
#define _A_HIDDEN (0x02) /* Hidden file */
#define _A_SUBDIR (0x10) /* Subdirectory */
+1 -1
View File
@@ -49,7 +49,7 @@
*/
#include <stdio.h>
#include <AzCore/PlatformDef.h>
#include <AzCore/PlatformIncl.h>
#include <AzCore/Module/Environment.h>
#define INJECT_ENVIRONMENT_FUNCTION "InjectEnvironment"
+2
View File
@@ -26,4 +26,6 @@
typedef uint64_t threadID;
#define VK_CONTROL 0
#endif // CRYINCLUDE_CRYCOMMON_MACSPECIFIC_H
@@ -230,7 +230,7 @@ namespace TestImpact
processInFlight.m_process = LaunchProcess(AZStd::move(processInfo));
processInFlight.m_startTime = createTime;
}
catch (ProcessException& e)
catch ([[maybe_unused]] ProcessException& e)
{
AZ_Warning("ProcessScheduler", false, e.what());
createResult = LaunchResult::Failure;
@@ -169,7 +169,7 @@ namespace TestImpact
WriteFileContents<TestEngineException>(SerializeTestEnumeration(enumeration.value()), jobInfo->GetCache()->m_file);
}
}
catch (const Exception& e)
catch ([[maybe_unused]] const Exception& e)
{
AZ_Warning("Enumerate", false, e.what());
enumerations[jobId] = AZStd::nullopt;
@@ -8,6 +8,7 @@
#include <AzCore/std/string/conversions.h>
#include <AzCore/std/string/string.h>
#include <AzFramework/Windowing/WindowBus.h>
#include <Atom/RHI/CpuProfiler.h>
#include <RHI/Device.h>
#include <RHI/Image.h>