From 5d800d43668360b5752277108247fdd5c5069301 Mon Sep 17 00:00:00 2001 From: Aryadev Chavali Date: Tue, 31 Oct 2023 21:14:14 +0000 Subject: Moved inst module to lib As it has no dependencies on vm specifically, and it's more necessary for any vendors who wish to target the virtual machine, it makes more sense for inst to be a lib module rather than a vm module. --- Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index d0d8c00..285953a 100644 --- a/Makefile +++ b/Makefile @@ -14,7 +14,7 @@ TERM_RESET:=$(shell echo -e "\e[0;0m") ## Lib setup LIB_DIST=$(DIST)/lib LIB_SRC=lib -LIB_CODE:=$(addprefix $(LIB_SRC)/, base.c darr.c) +LIB_CODE:=$(addprefix $(LIB_SRC)/, base.c darr.c inst.c) LIB_OBJECTS:=$(LIB_CODE:$(LIB_SRC)/%.c=$(LIB_DIST)/%.o) LIB_DEPS:=$(LIB_OBJECTS:%.o=%.d) LIB_CFLAGS=$(CFLAGS) @@ -22,7 +22,7 @@ LIB_CFLAGS=$(CFLAGS) ## VM setup VM_DIST=$(DIST)/vm VM_SRC=vm -VM_CODE:=$(addprefix $(VM_SRC)/, inst.c runtime.c) +VM_CODE:=$(addprefix $(VM_SRC)/, runtime.c) VM_OBJECTS:=$(VM_CODE:$(VM_SRC)/%.c=$(VM_DIST)/%.o) VM_DEPS:=$(VM_OBJECTS:%.o=%.d) $(VM_DIST)/main.d VM_CFLAGS:=$(CFLAGS) @@ -71,7 +71,7 @@ $(VM_DIST)/%.o: $(VM_SRC)/%.c @echo -e "$(TERM_GREEN)$@$(TERM_RESET): $<" ## ASSEMBLY Recipes -$(ASM_OUT): $(LIB_OBJECTS) $(VM_DIST)/inst.o $(ASM_OBJECTS) $(ASM_DIST)/main.o +$(ASM_OUT): $(LIB_OBJECTS) $(ASM_OBJECTS) $(ASM_DIST)/main.o @$(CC) $(ASM_CFLAGS) $^ -o $@ $(LIBS) @echo -e "$(TERM_GREEN)$@$(TERM_RESET): $^" -- cgit v1.2.3-13-gbd6f