From 86006fde68ef4c0053fa890a93b6346efe60a176 Mon Sep 17 00:00:00 2001
From: moparisthebest <admin@moparisthebest.com>
Date: Mon, 25 Oct 2021 02:43:55 -0400
Subject: [PATCH] fix makefile

---
 Makefile | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/Makefile b/Makefile
index e76123d..9aeeac4 100644
--- a/Makefile
+++ b/Makefile
@@ -15,8 +15,8 @@ HEADERTITLE = "EverDrive OS"
 SRCDIR = ./src
 INCDIR = ./inc
 RESDIR = ./res
-OBJDIR = ./obj
-BINDIR = ./bin
+BINDIR = ./target
+OBJDIR = $(BINDIR)/obj
 TOOLSDIR = ./tools
 
 RUST_DIR = ./rust
@@ -27,7 +27,7 @@ RUST_BIN_DEPS := $(RUST_DEPS) $(RUST_DIR)/mips-nintendo64-none.json
 RUST_H_DEPS   := $(RUST_DEPS) $(RUST_DIR)/cbindgen.toml
 
 LINK_FLAGS = -O1 -L$(ROOTDIR)/lib -L$(ROOTDIR)/mips64-elf/lib -ldragon -lmad -lyaml -lc -lm -ldragonsys -lnosys -L$(RUST_FULL_TARGET_DIR) -laltra64 $(LIBS) -Tn64ld.x
-PROG_NAME = OS64P
+PROG_NAME = $(BINDIR)/OS64P
 CFLAGS = -std=gnu99 -march=vr4300 -mtune=vr4300 -O1 -I$(INCDIR) -I$(ROOTDIR)/include -I$(ROOTDIR)/mips64-elf/include -I$(RUST_FULL_TARGET_DIR) -lpthread -lrt -D_REENTRANT -DUSE_TRUETYPE $(SET_DEBUG)
 ASFLAGS = -mtune=vr4300 -march=vr4300
 CC = $(GCCN64PREFIX)gcc
@@ -39,10 +39,10 @@ SOURCES := $(wildcard $(SRCDIR)/*.c)
 OBJECTS = $(SOURCES:$(SRCDIR)/%.c=$(OBJDIR)/%.o)
 
 $(PROG_NAME).v64: $(PROG_NAME).elf $(PROG_NAME).dfs
-	$(OBJCOPY) $(BINDIR)/$(PROG_NAME).elf $(BINDIR)/$(PROG_NAME).bin -O binary
-	rm -f $(BINDIR)/$(PROG_NAME).v64
-	$(N64TOOL) -l 4M -t $(HEADERTITLE) -h $(RESDIR)/$(HEADERNAME) -o $(BINDIR)/$(PROG_NAME).v64 $(BINDIR)/$(PROG_NAME).bin -s 1M $(BINDIR)/$(PROG_NAME).dfs
-	$(CHKSUM64PATH) $(BINDIR)/$(PROG_NAME).v64
+	$(OBJCOPY) $(PROG_NAME).elf $(PROG_NAME).bin -O binary
+	rm -f $(PROG_NAME).v64
+	$(N64TOOL) -l 4M -t $(HEADERTITLE) -h $(RESDIR)/$(HEADERNAME) -o $(PROG_NAME).v64 $(PROG_NAME).bin -s 1M $(PROG_NAME).dfs
+	$(CHKSUM64PATH) $(PROG_NAME).v64
 
 $(RUST_FULL_TARGET_DIR)/libaltra64.a: $(RUST_BIN_DEPS)
 	cd $(RUST_DIR) && cargo build --release --verbose --target mips-nintendo64-none.json -Z build-std=core
@@ -52,7 +52,7 @@ $(RUST_FULL_TARGET_DIR)/altra64.h: $(RUST_H_DEPS)
 
 $(PROG_NAME).elf : $(OBJECTS) $(RUST_FULL_TARGET_DIR)/libaltra64.a
 	@mkdir -p $(BINDIR)
-	$(LD) -o $(BINDIR)/$(PROG_NAME).elf $(OBJECTS) $(LINK_FLAGS)
+	$(LD) -o $(PROG_NAME).elf $(OBJECTS) $(LINK_FLAGS)
 
 $(OBJECTS): $(OBJDIR)/%.o : $(SRCDIR)/%.c $(RUST_FULL_TARGET_DIR)/altra64.h
 	@mkdir -p $(OBJDIR)
@@ -62,7 +62,8 @@ copy: $(PROG_NAME).v64
 	sh $(TOOLSDIR)/upload.sh
 
 $(PROG_NAME).dfs:
-	$(MKDFSPATH) $(BINDIR)/$(PROG_NAME).dfs $(RESDIR)/filesystem/
+	@mkdir -p $(BINDIR)
+	$(MKDFSPATH) $(PROG_NAME).dfs $(RESDIR)/filesystem/
 
 all: $(PROG_NAME).v64
 
@@ -71,5 +72,4 @@ debug: $(PROG_NAME).v64
 debug: SET_DEBUG=-DDEBUG
 
 clean:
-	rm -f $(BINDIR)/*.v64 $(BINDIR)/*.elf $(OBJDIR)/*.o $(BINDIR)/*.bin $(BINDIR)/*.dfs
-	rm -rf ./rust/target
+	rm -rf ./target ./rust/target