PrimeDecomp
/
prime
mirror of https://github.com/PrimeDecomp/prime.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update tools and disable shift_jis for most files

This commit is contained in:
Luke Street 2024-10-29 23:37:26 -06:00
parent 7dc5935796
commit bf18dbdc93
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
configure.py
View File

@ -151,9 +151,9 @@ if not config.non_matching:
# Tool versions # Tool versions
config.binutils_tag = "2.42-1" config.binutils_tag = "2.42-1"
config.compilers_tag = "20240706" config.compilers_tag = "20240706"
config.dtk_tag = "v1.1.4" config.dtk_tag = "v1.2.0"
config.objdiff_tag = "v2.3.2" config.objdiff_tag = "v2.3.4"
config.sjiswrap_tag = "v1.1.1" config.sjiswrap_tag = "v1.2.0"
config.wibo_tag = "0.6.11" config.wibo_tag = "0.6.11"
# Project # Project
@ -196,7 +196,6 @@ cflags_base = [
"-RTTI off", "-RTTI off",
"-fp_contract on", "-fp_contract on",
"-str reuse", "-str reuse",
"-multibyte",
"-i include", "-i include",
"-i extern/musyx/include", "-i extern/musyx/include",
"-i libc", "-i libc",
@ -212,6 +211,12 @@ if args.debug:
else: else:
cflags_base.append("-DNDEBUG=1") cflags_base.append("-DNDEBUG=1")
# Dolphin flags
cflags_dolphin = [
*cflags_base,
"-multibyte",
]
# Metrowerks library flags # Metrowerks library flags
cflags_runtime = [ cflags_runtime = [
*cflags_base, *cflags_base,
@ -290,10 +295,11 @@ def DolphinLib(lib_name, objects):
return { return {
"lib": lib_name + "D" if args.debug else "", "lib": lib_name + "D" if args.debug else "",
"mw_version": "GC/1.2.5n", "mw_version": "GC/1.2.5n",
"cflags": cflags_base, "cflags": cflags_dolphin,
"host": False, "host": False,
"progress_category": "sdk", "progress_category": "sdk",
"objects": objects, "objects": objects,
"shift_jis": True,
} }
@ -305,6 +311,7 @@ def RetroLib(lib_name, progress_category, objects):
"host": False, "host": False,
"progress_category": progress_category, "progress_category": progress_category,
"objects": objects, "objects": objects,
"shift_jis": False,
} }
@ -323,6 +330,7 @@ def MusyX(objects, mw_version="GC/1.3.2", debug=False, major=2, minor=0, patch=0
], ],
"progress_category": "third_party", "progress_category": "third_party",
"objects": objects, "objects": objects,
"shift_jis": False,
} }
@ -335,6 +343,7 @@ def Rel(lib_name, objects):
"host": True, "host": True,
"progress_category": "third_party", "progress_category": "third_party",
"objects": objects, "objects": objects,
"shift_jis": False,
} }
@ -986,6 +995,7 @@ config.libs = [
"cflags": cflags_runtime, "cflags": cflags_runtime,
"host": False, "host": False,
"progress_category": "third_party", "progress_category": "third_party",
"shift_jis": False,
"objects": [ "objects": [
Object(Matching, "Kyoto/zlib/adler32.c"), Object(Matching, "Kyoto/zlib/adler32.c"),
Object(Matching, "Kyoto/zlib/deflate.c"), Object(Matching, "Kyoto/zlib/deflate.c"),
@ -1185,6 +1195,7 @@ config.libs = [
"cflags": cflags_runtime, "cflags": cflags_runtime,
"host": False, "host": False,
"progress_category": "sdk", "progress_category": "sdk",
"shift_jis": False,
"objects": [ "objects": [
Object(Matching, "Runtime/__mem.c"), Object(Matching, "Runtime/__mem.c"),
Object(Matching, "Runtime/__va_arg.c"), Object(Matching, "Runtime/__va_arg.c"),