diff options
| author | Jasper St. Pierre <jstpierre@mecheye.net> | 2021-05-10 08:54:07 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-10 11:54:07 -0400 |
| commit | 462d71cbef02ef119fc2aa480b98cfeedde46441 (patch) | |
| tree | 923ed9f6f939c3e4b64dba0070e1539d05910089 /libs/SSystem | |
| parent | 9799fadfe84344fa3ea78835365570d832a476c7 (diff) | |
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>
Diffstat (limited to 'libs/SSystem')
| -rw-r--r-- | libs/SSystem/SComponent/Makefile | 2 | ||||
| -rw-r--r-- | libs/SSystem/SStandard/Makefile | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/libs/SSystem/SComponent/Makefile b/libs/SSystem/SComponent/Makefile index cabef9159d..f69e2c250c 100644 --- a/libs/SSystem/SComponent/Makefile +++ b/libs/SSystem/SComponent/Makefile @@ -98,6 +98,6 @@ $(BUILD_DIR)/libSComponent.a: $(LIBSCOMPONENT_A_O_FILES) $(BUILD_DIR)/libs/SSystem/SComponent/%.o: libs/SSystem/SComponent/%.cpp @mkdir -p $(@D) @echo building... $< - @iconv -f UTF-8 -t SHIFT-JIS -o $@.iconv.cpp $< + @iconv -f UTF-8 -t CP932 < $< > $@.iconv.cpp @$(CC) $(CFLAGS) $(LIBSCOMPONENT_A_CFLAGS) -c -o $@ $@.iconv.cpp diff --git a/libs/SSystem/SStandard/Makefile b/libs/SSystem/SStandard/Makefile index 4ac517ae6c..33a049acc2 100644 --- a/libs/SSystem/SStandard/Makefile +++ b/libs/SSystem/SStandard/Makefile @@ -24,6 +24,6 @@ $(BUILD_DIR)/libSStandard.a: $(LIBSSTANDARD_A_O_FILES) $(BUILD_DIR)/libs/SSystem/SStandard/%.o: libs/SSystem/SStandard/%.cpp @mkdir -p $(@D) @echo building... $< - @iconv -f UTF-8 -t SHIFT-JIS -o $@.iconv.cpp $< + @iconv -f UTF-8 -t CP932 < $< > $@.iconv.cpp @$(CC) $(CFLAGS) $(LIBSSTANDARD_A_CFLAGS) -c -o $@ $@.iconv.cpp |