Skip to content

Windows build improvement for ARM64 #154

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 6 commits into
base: stable
Choose a base branch
from
Open

Windows build improvement for ARM64 #154

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
df8ef5b
Provide option for ARM64EC builds
Kodikuu Jan 6, 2025
3d8f72a
Use vscmd var for build arch
Kodikuu Jan 6, 2025
484a976
Slightly better var ref
Kodikuu Jan 9, 2025
e5a1750
Adjust output for ARM64EC
Kodikuu Jan 9, 2025
163be64
Also adjust tests
Kodikuu Jan 14, 2025
7aa5845
Merge branch 'stable' into arm-windows
Kodikuu Jan 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
TARGET = windows
ARCH = %%Platform%%
ARCH = $(VSCMD_ARG_TGT_ARCH)
NAME = matoya

.SUFFIXES : .ps .vs .fragvk .vertvk
Expand Down Expand Up @@ -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)
Expand Down
6 changes: 5 additions & 1 deletion test/makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARCH = %%Platform%%
ARCH = $(VSCMD_ARG_TGT_ARCH)

BIN = \
mty.exe
Expand Down Expand Up @@ -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
Expand Down