From 92a2ab494d81ddb271be161514d89a84ef00e688 Mon Sep 17 00:00:00 2001 From: FeralChild64 Date: Thu, 17 Dec 2020 16:13:29 +0100 Subject: [PATCH] more appropriate directory name --- .gitmodules | 3 +++ {assembler => 3rdparty}/acme | 0 Makefile | 4 ++-- 3 files changed, 5 insertions(+), 2 deletions(-) rename {assembler => 3rdparty}/acme (100%) diff --git a/.gitmodules b/.gitmodules index 1ea12891..535a40c2 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,6 @@ [submodule "assembler/acme"] path = assembler/acme url = https://github.com/MEGA65/acme +[submodule "3rdparty/acme"] + path = 3rdparty/acme + url = https://github.com/MEGA65/acme diff --git a/assembler/acme b/3rdparty/acme similarity index 100% rename from assembler/acme rename to 3rdparty/acme diff --git a/Makefile b/Makefile index 08506f23..95e58042 100644 --- a/Makefile +++ b/Makefile @@ -78,7 +78,7 @@ SRC_MON_M65 = $(foreach dir,$(SRCDIR_MON_M65),$(wildcard $(dir)/*.s)) SRC_ZVM_M65 = $(foreach dir,$(SRCDIR_ZVM_M65),$(wildcard $(dir)/*.s)) SRC_TOOLS = $(wildcard tools/*.c,tools/*.cc) -DIR_ACME = assembler/acme/src +DIR_ACME = 3rdparty/acme/src HDR_ACME = $(filter-out $(wildcard $(DIR_ACME)/_*.h),$(wildcard $(DIR_ACME)/*.h)) SRC_ACME = $(DIR_ACME)/acme.c $(DIR_ACME)/platform.c $(DIR_ACME)/alu.c $(DIR_ACME)/typesystem.c \ $(DIR_ACME)/cliargs.c $(DIR_ACME)/global.c $(DIR_ACME)/output.c $(DIR_ACME)/flow.c \ @@ -284,7 +284,7 @@ $(TOOL_ASSEMBLER): $(DIR_ACME) $(SRC_ACME) $(HDR_ACME) @echo @echo Compiling tool $@ ... @mkdir -p build/tools - @$(CC) -o $(TOOL_ASSEMBLER) $(SRC_ACME) -lm -w -I./assembler/acme/src + @$(CC) -o $(TOOL_ASSEMBLER) $(SRC_ACME) -lm -w -I./3rdparty/acme/src $(TOOL_PNGPREPARE): tools/pngprepare.c @echo