From 6ed90a6b90902d3f615869b849f1e3ec317b9a5a Mon Sep 17 00:00:00 2001 From: Kayne Ruse Date: Tue, 15 Aug 2023 05:29:55 +1000 Subject: [PATCH] Updated makefiles --- Airport/Box | 2 +- Airport/source/makefile | 4 ++-- makefile | 16 ++++++++-------- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Airport/Box b/Airport/Box index ed96607..9f2d4bf 160000 --- a/Airport/Box +++ b/Airport/Box @@ -1 +1 @@ -Subproject commit ed9660763276a75df9e6eaad4ca5042d611f51cb +Subproject commit 9f2d4bf8ae1be75ba9443521c8783d185aa4d82a diff --git a/Airport/source/makefile b/Airport/source/makefile index 393c0a5..a3da079 100644 --- a/Airport/source/makefile +++ b/Airport/source/makefile @@ -8,12 +8,12 @@ ODIR = obj SRC = $(wildcard *.c) OBJ = $(addprefix $(ODIR)/,$(SRC:.c=.o)) -OUT=../$(OUTDIR)/airport +OUT=../../$(OUTDIR)/airport all: game game: $(OBJ) - $(CC) $(CFLAGS) -o $(OUT) $(OBJ) -Wl,-rpath,. -L../$(OUTDIR) $(LIBS) + $(CC) $(CFLAGS) -o $(OUT) $(OBJ) -Wl,-rpath,. -L../../$(OUTDIR) $(LIBS) game-release: game strip $(OUT) diff --git a/makefile b/makefile index 489512e..e4e35e3 100644 --- a/makefile +++ b/makefile @@ -1,30 +1,30 @@ export CFLAGS+=-std=c18 -pedantic -Werror export OUTDIR = out -export BOX_OUTDIR = ../$(OUTDIR) -export TOY_OUTDIR = ../../$(OUTDIR) +export BOX_OUTDIR = ../../$(OUTDIR) +export TOY_OUTDIR = ../../../$(OUTDIR) all: toy box game toy: $(OUTDIR) - $(MAKE) -j8 -C Box/Toy/source + $(MAKE) -j8 -C Airport/Box/Toy/source box: $(OUTDIR) - $(MAKE) -j8 -C Box/source + $(MAKE) -j8 -C Airport/Box/source game: $(OUTDIR) - $(MAKE) -j8 -C source + $(MAKE) -j8 -C Airport/source ln -f -s ../assets -t $(OUTDIR) #release toy-release: $(OUTDIR) - $(MAKE) -j8 -C Box/Toy/source library-release + $(MAKE) -j8 -C Airport/Box/Toy/source library-release box-release: $(OUTDIR) - $(MAKE) -j8 -C Box/source library-release + $(MAKE) -j8 -C Airport/Box/source library-release game-release: $(OUTDIR) - $(MAKE) -j8 -C source game-release + $(MAKE) -j8 -C Airport/source game-release cp -r assets $(OUTDIR) #distribution