diff --git a/README.md b/README.md index 15cb21d..333fc16 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,9 @@ -# VampireToyvivors +# ToyBox A test game for The Toy Programming Langauge. Requires raylib and Toy by default. See https://toylang.com/ for details. -Note: Vampire Survivors is a simple design, so it makes sense to test Toy with it - this project isn't intended for retail. - ## Raylib for RPi ```bash diff --git a/Toy b/Toy index a00739f..4e31c0c 160000 --- a/Toy +++ b/Toy @@ -1 +1 @@ -Subproject commit a00739f58074500fd683a7341ee9ae646c3f5a2a +Subproject commit 4e31c0c551883a7f262e7f04ea78c13c798de2c9 diff --git a/makefile b/makefile index b831e93..eb3041b 100644 --- a/makefile +++ b/makefile @@ -7,21 +7,21 @@ #TODO: add debug & release build options, at least for Toy #directories -export VAMP_SOURCEDIR=source -export VAMP_OUTDIR=out -export VAMP_OBJDIR=obj +export BOX_SOURCEDIR=source +export BOX_OUTDIR=out +export BOX_OBJDIR=obj #Override Toy's build destination export TOY_SOURCEDIR=Toy/source -export TOY_OUTDIR=../$(VAMP_OUTDIR) -export TOY_OBJDIR=$(VAMP_OBJDIR) +export TOY_OUTDIR=../$(BOX_OUTDIR) +export TOY_OBJDIR=$(BOX_OBJDIR) #targets -all: $(VAMP_OUTDIR) Toy tools source +all: $(BOX_OUTDIR) Toy tools source .PHONY: source source: - $(MAKE) -C $(VAMP_SOURCEDIR) + $(MAKE) -C $(BOX_SOURCEDIR) .PHONY: Toy Toy: @@ -29,12 +29,12 @@ Toy: .PHONY: tools tools: - cp Toy/repl/*library* $(VAMP_SOURCEDIR) - cp Toy/repl/*inspector* $(VAMP_SOURCEDIR) + cp Toy/repl/*library* $(BOX_SOURCEDIR) + cp Toy/repl/*inspector* $(BOX_SOURCEDIR) #util targets -$(VAMP_OUTDIR): - mkdir $(VAMP_OUTDIR) +$(BOX_OUTDIR): + mkdir $(BOX_OUTDIR) #util commands .PHONY: clean diff --git a/source/makefile b/source/makefile index 69661aa..ca23d61 100644 --- a/source/makefile +++ b/source/makefile @@ -13,13 +13,13 @@ GAME_ROOTDIR=.. GAME_SOURCEDIR=. GAME_TOYDIR=$(GAME_ROOTDIR)/$(TOY_SOURCEDIR) -GAME_OUTDIR=$(GAME_ROOTDIR)/$(VAMP_OUTDIR) -GAME_OBJDIR=$(VAMP_OBJDIR) +GAME_OUTDIR=$(GAME_ROOTDIR)/$(BOX_OUTDIR) +GAME_OBJDIR=$(BOX_OBJDIR) #file names GAME_SOURCEFILES=$(wildcard $(GAME_SOURCEDIR)/*.c) GAME_OBJFILES=$(addprefix $(GAME_OBJDIR)/,$(notdir $(GAME_SOURCEFILES:.c=.o))) -GAME_TARGETNAME=vampires +GAME_TARGETNAME=BOXires #file extensions ifeq ($(OS),Windows_NT)