Skip to content

Commit

Permalink
Make some progress on ninja asm build (doldecomp#1375)
Browse files Browse the repository at this point in the history
  • Loading branch information
ribbanya authored Mar 5, 2024
1 parent 085f726 commit 5004335
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 18 deletions.
File renamed without changes.
10 changes: 0 additions & 10 deletions asm/dolphin/dvd/dvd.s

This file was deleted.

12 changes: 6 additions & 6 deletions configure.py
Original file line number Diff line number Diff line change
Expand Up @@ -70,9 +70,9 @@
help="generate map file(s)",
)
parser.add_argument(
"--no-asm",
action="store_true",
default=True,
"--use-asm",
dest="no_asm",
action="store_false",
help="don't incorporate .s files from asm directory",
)
parser.add_argument(
Expand Down Expand Up @@ -107,8 +107,8 @@
parser.add_argument(
"--msg-style",
choices=["mpw", "std", "gcc", "ide", "parseable"],
default="gcc",
help="message style of the compiler (default 'gcc')",
default="std",
help="message style of the compiler (default 'std')",
)
parser.add_argument(
"--max-errors",
Expand Down Expand Up @@ -173,7 +173,6 @@
config.ldflags = [
"-fp hardware",
"-nodefaults",
"-msgstyle gcc",
"-warn off",
]

Expand Down Expand Up @@ -217,6 +216,7 @@

if args.msg_style is not None:
cflags_base.append(f"-msgstyle {args.msg_style}")
config.ldflags.append(f"-msgstyle {args.msg_style}")

if args.warn is not None:
cflags_base.append(f"-warn {args.warn}")
Expand Down
3 changes: 1 addition & 2 deletions obj_files.mk
Original file line number Diff line number Diff line change
Expand Up @@ -810,7 +810,7 @@ TEXT_O_FILES +=\
$(BUILD_DIR)/asm/MetroTRK/dispatch.s.o\
$(BUILD_DIR)/asm/MetroTRK/msghndlr.s.o\
$(BUILD_DIR)/asm/MetroTRK/flush_cache.s.o\
$(BUILD_DIR)/asm/MetroTRK/mem_TRK.s.o\
$(BUILD_DIR)/asm/MetroTRK/mem_TRK_text.s.o\
$(BUILD_DIR)/asm/MetroTRK/targimpl.s.o\
$(BUILD_DIR)/asm/MetroTRK/dolphin_trk.s.o\
$(BUILD_DIR)/asm/MetroTRK/mpc_7xx_603e.s.o\
Expand Down Expand Up @@ -849,7 +849,6 @@ TEXT_O_FILES +=\
$(BUILD_DIR)/asm/dolphin/dvd/dvdlow.s.o\
$(BUILD_DIR)/src/dolphin/dvd/dvdfs.c.o\
$(BUILD_DIR)/src/dolphin/dvd/dvd.c.o\
$(BUILD_DIR)/asm/dolphin/dvd/dvd.s.o\
$(BUILD_DIR)/src/dolphin/dvd/dvdqueue.c.o\
$(BUILD_DIR)/asm/dolphin/dvd/dvderror.s.o\
$(BUILD_DIR)/src/dolphin/dvd/fstload.c.o\
Expand Down

0 comments on commit 5004335

Please sign in to comment.