mirror of
https://github.com/zeldaret/tp
synced 2026-06-02 02:00:30 -04:00
Makefile fixes / JUTNameTab (#129)
* Makefile: Fix issues with iconv causing it to break under devkitPro / msys The version of iconv included in devkitPro does not have a -o option, so replace it with normal shell redirection. Also, SHIFT-JIS does not have a mapping for ~, so output the Windows CP932 variant instead, which does. See: https://en.wikipedia.org/wiki/Tilde#Unicode_and_Shift_JIS_encoding_of_wave_dash https://en.wikipedia.org/wiki/Code_page_932_(Microsoft_Windows)#Single-byte_character_differences * Update diff configuration -Bbinary doesn't seem to work with my copy of bjdump (it says it can't decode unknown architecture) Cheese things by using expected/ instead of having the user place things manually. * JUTNameTab * J3DPacket / J3DDrawBuffer * format Co-authored-by: lepelog <lepelog@users.noreply.github.com>
This commit is contained in:
committed by
GitHub
parent
9799fadfe8
commit
462d71cbef
@@ -61,7 +61,7 @@ async def create_library(library: Library):
|
||||
await builder.write(f"{o_path}/%.o: {cpp_path}/%.cpp")
|
||||
await builder.write(f"\t@mkdir -p $(@D)")
|
||||
await builder.write(f"\t@echo building... $<")
|
||||
await builder.write(f"\t@iconv -f UTF-8 -t SHIFT-JIS -o $@.iconv.cpp $<")
|
||||
await builder.write(f"\t@iconv -f UTF-8 -t CP932 < $< > $@.iconv.cpp")
|
||||
await builder.write(f"\t@$(CC) $(CFLAGS) $({prefix}_CFLAGS) -c -o $@ $@.iconv.cpp")
|
||||
await builder.write("")
|
||||
|
||||
@@ -149,7 +149,7 @@ async def create_rel(module: Module, rel_path: Path):
|
||||
await builder.write(f"{o_path}/%.o: {cpp_path}/%.cpp")
|
||||
await builder.write(f"\t@echo [{module.index:>3}] building $@")
|
||||
await builder.write(f"\t@mkdir -p $(@D)")
|
||||
await builder.write(f"\t@iconv -f UTF-8 -t SHIFT-JIS -o $@.iconv.cpp $<")
|
||||
await builder.write(f"\t@iconv -f UTF-8 -t CP932 < $< > $@.iconv.cpp")
|
||||
await builder.write(f"\t@$(CC) $(CFLAGS) $({prefix}_CFLAGS) -c -o $@ $@.iconv.cpp")
|
||||
await builder.write("")
|
||||
|
||||
|
||||
Reference in New Issue
Block a user