commit 8bc00b82f27f8d542fe63ace56cdcbe1bc84f757
parent 58c46f5d77d08d6d3ccee2492c25353438b201d3
Author: CrashOveride95 <crashoveride953@gmail.com>
Date: Sat, 21 Nov 2020 13:32:04 -0500
Change up makefile
Diffstat:
4 files changed, 30 insertions(+), 175 deletions(-)
diff --git a/README.md b/README.md
@@ -35,7 +35,7 @@ The romname is an example, however it must be in .z64.
Then copy the extracted data to "Data" folder, then cd to the main doom64 folder and run make:
-``make -f Makefile.ique``
+``make PLATFORM=BB``
Your ROM will be in doom64.n64, and can be ran on your iQue.
diff --git a/doom64/MAKE_ROM.bat b/doom64/MAKE_ROM.bat
@@ -25,7 +25,7 @@ cd %mypath%
@echo on
-make
+make PLATFORM=PARTNER
@echo off
::remove_all:
diff --git a/doom64/Makefile b/doom64/Makefile
@@ -6,42 +6,24 @@ FINAL = YES
ifeq ($(FINAL), YES)
OPTIMIZER = -O2
LCDEFS = -DNDEBUG -D_FINALROM -DF3DEX_GBI
+ifeq ($(PLATFORM), BB)
+ N64LIB = -lultra_rom
+else
N64LIB = -lgultra_rom
- TARGETS = Doom64.n64
+endif
else
OPTIMIZER = -g3
- LCDEFS = -DF3DEX_GBI -DL3DEX_GBI -DDEBUG
+ LCDEFS = -DF3DEX_GBI -DDEBUG
+ifeq ($(PLATFORM), BB)
+ N64LIB = -lultra_d
+else
N64LIB = -lgultra_d
- TARGETS = Doom64_d.n64
endif
+endif
+
+APP = doom64.out
-APP = Doom64.out
-
-HFILES = graph.h\
- doomdef.h \
- doomdata.h \
- doominfo.h \
- r_local.h \
- st_main.h \
- sounds.h \
- stdarg.h \
- audio.h \
- wessshell.h \
- wesstwek.h \
- wessapi.h \
- wessapim.h \
- wessapip.h \
- wessapit.h \
- wesshand.h \
- wesstrak.h \
- wessedit.h \
- wessarc.h \
- funqueue.h \
- wessfade.h \
- wessseq.h \
- n64cmd.h \
- seqload.h \
- wessint_s.h
+TARGETS = doom64.n64
ASMFILES = wessint_s.s
#m_fixed_s.s
@@ -132,14 +114,24 @@ CODESEGMENT = codesegment.o
OBJECTS = $(CODESEGMENT) $(DATAOBJECTS)
LCINCS = -I. -I$(ROOT)/usr/include/PR
-LCOPTS = -G 0
-LDFLAGS = $(MKDEPOPT) -L$(ROOT)/usr/lib $(N64LIB) -L$(GCCDIR)/mipse/lib -lkmc
LDIRT = $(APP)
PATH_PRINC = $(ROOT)/usr/include/PR
PATH_PRLIB = $(ROOT)/usr/lib/PR
-ASFLAGS = -mips3 -non_shared -g -I$(PATH_PRINC) -I$(PATH_INC) -o
+
+LCOPTS = -G 0
+LDFLAGS = -L$(ROOT)/usr/lib $(N64LIB)
+ASFLAGS = -non_shared -g -I$(PATH_PRINC) -I$(PATH_INC)
+
+ifeq ($(PLATFORM), BB)
+LCOPTS += -mips2
+LDFLAGS += -lgcc
+ASFLAGS += -mips2
+else
+LDFLAGS += -L$(GCCDIR)/mipse/lib -lkmc
+ASFLAGS += -mips3
+endif
default: $(TARGETS)
@@ -148,11 +140,10 @@ include $(COMMONRULES)
$(CODESEGMENT): $(CODEOBJECTS)
$(LD) -o $(CODESEGMENT) -r $(CODEOBJECTS) $(LDFLAGS)
-ifeq ($(FINAL), YES)
$(TARGETS) $(APP): spec $(OBJECTS)
- $(MAKEROM) -s 9 -r $(TARGETS) -e $(APP) spec
+ifeq ($(FINAL), YES)
+ $(MAKEROM) -s 64 -r $(TARGETS) spec
makemask $(TARGETS)
else
-$(TARGETS) $(APP): spec $(OBJECTS)
- $(MAKEROM) -r $(TARGETS) -e $(APP) spec
+ $(MAKEROM) -r $(TARGETS) spec
endif
diff --git a/doom64/Makefile.ique b/doom64/Makefile.ique
@@ -1,136 +0,0 @@
-#!smake
-include $(ROOT)/usr/include/make/PRdefs
-
-FINAL = YES
-
-ifeq ($(FINAL), YES)
- OPTIMIZER = -O2
- LCDEFS = -DNDEBUG -D_FINALROM -DF3DEX_GBI
- N64LIB = -lultra_rom
-else
- OPTIMIZER = -g3
- LCDEFS = -DF3DEX_GBI -DDEBUG
- N64LIB = -lultra_d
-endif
-
-APP = doom64
-
-TARGETS = doom64.n64
-
-MAPFILE = doom64.map
-
-ASMFILES = wessint_s.s
-#m_fixed_s.s
-
-CODEFILES = graph.c asci.c \
- doominfo.c \
- sprinfo.c \
- m_bbox.c \
- am_main.c \
- doomlib.c \
- vsprintf.c \
- c_convert.c \
- d_main.c \
- f_main.c \
- g_game.c \
- in_main.c \
- m_fixed.c \
- i_main.c \
- m_main.c \
- m_password.c \
- p_base.c \
- p_misc.c \
- p_telept.c \
- p_ceilng.c \
- p_change.c \
- p_doors.c \
- p_enemy.c \
- p_floor.c \
- p_inter.c \
- p_lights.c \
- p_map.c \
- p_slide.c \
- p_shoot.c \
- p_maputl.c \
- p_mobj.c \
- p_move.c \
- p_plats.c \
- p_pspr.c \
- p_setup.c \
- p_sight.c \
- p_spec.c \
- p_macros.c \
- p_switch.c \
- p_tick.c \
- p_user.c \
- r_data.c \
- r_main.c \
- r_phase1.c \
- r_phase2.c \
- r_phase3.c \
- s_sound.c \
- st_main.c \
- d_screens.c \
- w_wad.c \
- z_zone.c \
- decodes.c \
- tables.c \
- audio.c \
- wessshell.c \
- wesstwek.c \
- wessapi.c \
- wessapic.c \
- wessapim.c \
- wessapip.c \
- wessapit.c \
- wesshand.c \
- wesstrak.c \
- wessedit.c \
- wessarc.c \
- funqueue.c \
- wessfade.c \
- wessseq.c \
- n64cmd.c \
- seqload.c \
- seqloadl.c \
- seqloadr.c
-
-WESSLIB = #wesslib.o
-
-CODEOBJECTS = $(CODEFILES:.c=.o) $(ASMFILES:.s=.o) $(WESSLIB)
-
-DATAFILES = mem_heap.c audio_heap.c cfb.c
-
-DATAOBJECTS = $(DATAFILES:.c=.o)
-
-CODESEGMENT = codesegment.o
-
-OBJECTS = $(CODESEGMENT) $(DATAOBJECTS)
-
-LCINCS = -I. -I$(ROOT)/usr/include/PR
-LCOPTS = -G 0 -mips2
-
-LDFLAGS = $(MKDEPOPT) -L$(ROOT)/usr/lib $(N64LIB) -lgcc
-LDIRT = $(APP) $(MAPFILE)
-
-PATH_INC = $(ROOT)/usr/include
-PATH_PRINC = $(ROOT)/usr/include/PR
-PATH_PRLIB = $(ROOT)/usr/lib/PR
-ASFLAGS = -mips2 -non_shared -g -I$(PATH_PRINC) -I$(PATH_INC)
-
-default: $(TARGETS)
-
-include $(COMMONRULES)
-
-$(CODESEGMENT): $(CODEOBJECTS)
- $(LD) -o $(CODESEGMENT) -r $(CODEOBJECTS) $(LDFLAGS)
-
-$(TARGETS) $(APP): spec $(OBJECTS)
-ifeq ($(FINAL), YES)
- $(MAKEROM) -m -s 64 -r $(TARGETS) spec > $(MAPFILE)
- makemask $(TARGETS)
-else
- $(MAKEROM) -m -r $(TARGETS) spec > $(MAPFILE)
-endif
-
-
