From 1d188c4f816fce8728fdffaa7ad6ef205ca05abd Mon Sep 17 00:00:00 2001 From: Nicholas Noll Date: Fri, 17 Apr 2020 18:50:29 -0700 Subject: chore: update naming & calling conventions --- Makefile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 65eb8b5..9c1307b 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ # Compiler, Linker, and Assembler -CC := clang -AR := ar -ASMR := nasm +CC := clang +AR := ar +AS := nasm # All needed build directories INC_DIR := include @@ -23,6 +23,7 @@ TGTLIBS := COMPILE = $(CC) -MMD $(CFLAGS) $(TGTFLAGS) $(INCS) $(TGTINCS) -o $@ -c $< LINK = $(CC) -MMD $(CFLAGS) $(TGTFLAGS) -o $@ $^ $(LIBS) $(TGTLIBS) COMPLINK = $(CC) -MMD $(CFLAGS) $(TGTFLAGS) $(INCS) $(TGTINCS) -o $@ $< $(LIBS) +ASSEMBLE = $(AS) $(AFLAGS) $(TGTFLAGS) -o $@ $< ARCHIVE = $(AR) -crs $@ $^ include rules.mk -- cgit v1.2.1