moparisthebest/altra64
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix makefile

Browse Source
This commit is contained in:
Travis Burtrum 2021-10-25 02:43:55 -04:00
parent 908f950ff0
commit 86006fde68
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Makefile
View File

@ -15,8 +15,8 @@ HEADERTITLE = "EverDrive OS"
SRCDIR = ./src SRCDIR = ./src
INCDIR = ./inc INCDIR = ./inc
RESDIR = ./res RESDIR = ./res
OBJDIR = ./obj BINDIR = ./target
BINDIR = ./bin OBJDIR = $(BINDIR)/obj
TOOLSDIR = ./tools TOOLSDIR = ./tools
RUST_DIR = ./rust 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 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 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) 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 ASFLAGS = -mtune=vr4300 -march=vr4300
CC = $(GCCN64PREFIX)gcc CC = $(GCCN64PREFIX)gcc
@ -39,10 +39,10 @@ SOURCES := $(wildcard $(SRCDIR)/*.c)
OBJECTS = $(SOURCES:$(SRCDIR)/%.c=$(OBJDIR)/%.o) OBJECTS = $(SOURCES:$(SRCDIR)/%.c=$(OBJDIR)/%.o)
$(PROG_NAME).v64: $(PROG_NAME).elf $(PROG_NAME).dfs $(PROG_NAME).v64: $(PROG_NAME).elf $(PROG_NAME).dfs
$(OBJCOPY) $(BINDIR)/$(PROG_NAME).elf $(BINDIR)/$(PROG_NAME).bin -O binary $(OBJCOPY) $(PROG_NAME).elf $(PROG_NAME).bin -O binary
rm -f $(BINDIR)/$(PROG_NAME).v64 rm -f $(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 $(N64TOOL) -l 4M -t $(HEADERTITLE) -h $(RESDIR)/$(HEADERNAME) -o $(PROG_NAME).v64 $(PROG_NAME).bin -s 1M $(PROG_NAME).dfs
$(CHKSUM64PATH) $(BINDIR)/$(PROG_NAME).v64 $(CHKSUM64PATH) $(PROG_NAME).v64
$(RUST_FULL_TARGET_DIR)/libaltra64.a: $(RUST_BIN_DEPS) $(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 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 $(PROG_NAME).elf : $(OBJECTS) $(RUST_FULL_TARGET_DIR)/libaltra64.a
@mkdir -p $(BINDIR) @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 $(OBJECTS): $(OBJDIR)/%.o : $(SRCDIR)/%.c $(RUST_FULL_TARGET_DIR)/altra64.h
@mkdir -p $(OBJDIR) @mkdir -p $(OBJDIR)
@ -62,7 +62,8 @@ copy: $(PROG_NAME).v64
sh $(TOOLSDIR)/upload.sh sh $(TOOLSDIR)/upload.sh
$(PROG_NAME).dfs: $(PROG_NAME).dfs:
$(MKDFSPATH) $(BINDIR)/$(PROG_NAME).dfs $(RESDIR)/filesystem/ @mkdir -p $(BINDIR)
$(MKDFSPATH) $(PROG_NAME).dfs $(RESDIR)/filesystem/
all: $(PROG_NAME).v64 all: $(PROG_NAME).v64
@ -71,5 +72,4 @@ debug: $(PROG_NAME).v64
debug: SET_DEBUG=-DDEBUG debug: SET_DEBUG=-DDEBUG
clean: clean:
rm -f $(BINDIR)/*.v64 $(BINDIR)/*.elf $(OBJDIR)/*.o $(BINDIR)/*.bin $(BINDIR)/*.dfs rm -rf ./target ./rust/target
rm -rf ./rust/target