diff --git a/makefile b/makefile index cd4789d4..05dfdab8 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 @@ -115,6 +115,12 @@ DEFS = $(DEFS) -DMTY_VK_DEBUG FLAGS = $(FLAGS) /O2 /GS- /Gw !ENDIF +!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) all: clean-build clear $(SHADERS) $(OBJS) diff --git a/test/makefile b/test/makefile index 9d9198f8..4d294b95 100644 --- a/test/makefile +++ b/test/makefile @@ -1,4 +1,4 @@ -ARCH = %%Platform%% +ARCH = $(VSCMD_ARG_TGT_ARCH) BIN = \ mty.exe @@ -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