From df8ef5b4fb18365786293e2a757be3db038e4a2e Mon Sep 17 00:00:00 2001 From: Callum Watson Date: Mon, 6 Jan 2025 16:23:20 +0000 Subject: [PATCH 1/5] Provide option for ARM64EC builds --- makefile | 5 +++++ test/makefile | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/makefile b/makefile index cd4789d46..1375b4c27 100644 --- a/makefile +++ b/makefile @@ -115,6 +115,11 @@ DEFS = $(DEFS) -DMTY_VK_DEBUG FLAGS = $(FLAGS) /O2 /GS- /Gw !ENDIF +!IFDEF ARM64EC +FLAGS = $(FLAGS) /arm64EC +LIB_FLAGS = $(LIB_FLAGS) /MACHINE:arm64ec +!ENDIF + CFLAGS = $(INCLUDES) $(DEFS) $(FLAGS) all: clean-build clear $(SHADERS) $(OBJS) diff --git a/test/makefile b/test/makefile index 9d9198f8f..f7325b7fd 100644 --- a/test/makefile +++ b/test/makefile @@ -37,6 +37,10 @@ LIBS = \ ws2_32.lib \ xinput.lib +!IFDEF ARM64EC +CFLAGS = $(CFLAGS) /arm64EC +!ENDIF + test: clean clear cl $(CFLAGS) /Fe:$(BIN) src\$@.c $(LIBS) @mty From 3d8f72a9afc6a00f97d5d3894d65e8bca09a4204 Mon Sep 17 00:00:00 2001 From: Callum Watson Date: Mon, 6 Jan 2025 16:24:42 +0000 Subject: [PATCH 2/5] Use vscmd var for build arch --- makefile | 2 +- test/makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/makefile b/makefile index 1375b4c27..dd41ce8cc 100644 --- a/makefile +++ b/makefile @@ -1,5 +1,5 @@ TARGET = windows -ARCH = %%Platform%% +ARCH = %%VSCMD_ARG_TGT_ARCH%% NAME = matoya .SUFFIXES : .ps .vs .fragvk .vertvk diff --git a/test/makefile b/test/makefile index f7325b7fd..a7b3b4fc7 100644 --- a/test/makefile +++ b/test/makefile @@ -1,4 +1,4 @@ -ARCH = %%Platform%% +ARCH = %%VSCMD_ARG_TGT_ARCH%% BIN = \ mty.exe From 484a9763a324ce9d6f862d4b303fbe15cc7311bb Mon Sep 17 00:00:00 2001 From: Callum Watson Date: Thu, 9 Jan 2025 13:18:26 +0000 Subject: [PATCH 3/5] Slightly better var ref --- makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/makefile b/makefile index dd41ce8cc..ec74211a9 100644 --- a/makefile +++ b/makefile @@ -1,5 +1,5 @@ TARGET = windows -ARCH = %%VSCMD_ARG_TGT_ARCH%% +ARCH = $(VSCMD_ARG_TGT_ARCH) NAME = matoya .SUFFIXES : .ps .vs .fragvk .vertvk From e5a1750783b8ffc50e0248168d5fc351d6f189fa Mon Sep 17 00:00:00 2001 From: Callum Watson Date: Thu, 9 Jan 2025 13:19:54 +0000 Subject: [PATCH 4/5] Adjust output for ARM64EC --- makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/makefile b/makefile index ec74211a9..05dfdab8d 100644 --- a/makefile +++ b/makefile @@ -118,6 +118,7 @@ FLAGS = $(FLAGS) /O2 /GS- /Gw !IFDEF ARM64EC FLAGS = $(FLAGS) /arm64EC LIB_FLAGS = $(LIB_FLAGS) /MACHINE:arm64ec +ARCH = arm64ec # ARM64 and ARM64EC are not the same !ENDIF CFLAGS = $(INCLUDES) $(DEFS) $(FLAGS) From 163be64ae28d992d4e7c1a65075839164ff2ccce Mon Sep 17 00:00:00 2001 From: Callum Watson Date: Tue, 14 Jan 2025 14:44:06 +0000 Subject: [PATCH 5/5] Also adjust tests --- test/makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/makefile b/test/makefile index a7b3b4fc7..4d294b95f 100644 --- a/test/makefile +++ b/test/makefile @@ -1,4 +1,4 @@ -ARCH = %%VSCMD_ARG_TGT_ARCH%% +ARCH = $(VSCMD_ARG_TGT_ARCH) BIN = \ mty.exe