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/JSystem/JStudio | |
| 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/JSystem/JStudio')
| -rw-r--r-- | libs/JSystem/JStudio/JStudio/Makefile | 2 | ||||
| -rw-r--r-- | libs/JSystem/JStudio/JStudio_JAudio2/Makefile | 2 | ||||
| -rw-r--r-- | libs/JSystem/JStudio/JStudio_JParticle/Makefile | 2 | ||||
| -rw-r--r-- | libs/JSystem/JStudio/JStudio_JStage/Makefile | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/libs/JSystem/JStudio/JStudio/Makefile b/libs/JSystem/JStudio/JStudio/Makefile index b092fc5baf..5f63aeff5f 100644 --- a/libs/JSystem/JStudio/JStudio/Makefile +++ b/libs/JSystem/JStudio/JStudio/Makefile @@ -50,6 +50,6 @@ $(BUILD_DIR)/libJStudio.a: $(LIBJSTUDIO_A_O_FILES) $(BUILD_DIR)/libs/JSystem/JStudio/JStudio/%.o: libs/JSystem/JStudio/JStudio/%.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) $(LIBJSTUDIO_A_CFLAGS) -c -o $@ $@.iconv.cpp diff --git a/libs/JSystem/JStudio/JStudio_JAudio2/Makefile b/libs/JSystem/JStudio/JStudio_JAudio2/Makefile index b17b2a4e76..e1d7941579 100644 --- a/libs/JSystem/JStudio/JStudio_JAudio2/Makefile +++ b/libs/JSystem/JStudio/JStudio_JAudio2/Makefile @@ -26,6 +26,6 @@ $(BUILD_DIR)/libJStudio_JAudio2.a: $(LIBJSTUDIO_JAUDIO2_A_O_FILES) $(BUILD_DIR)/libs/JSystem/JStudio/JStudio_JAudio2/%.o: libs/JSystem/JStudio/JStudio_JAudio2/%.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) $(LIBJSTUDIO_JAUDIO2_A_CFLAGS) -c -o $@ $@.iconv.cpp diff --git a/libs/JSystem/JStudio/JStudio_JParticle/Makefile b/libs/JSystem/JStudio/JStudio_JParticle/Makefile index 826ed1e416..8bf67212e5 100644 --- a/libs/JSystem/JStudio/JStudio_JParticle/Makefile +++ b/libs/JSystem/JStudio/JStudio_JParticle/Makefile @@ -26,6 +26,6 @@ $(BUILD_DIR)/libJStudio_JParticle.a: $(LIBJSTUDIO_JPARTICLE_A_O_FILES) $(BUILD_DIR)/libs/JSystem/JStudio/JStudio_JParticle/%.o: libs/JSystem/JStudio/JStudio_JParticle/%.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) $(LIBJSTUDIO_JPARTICLE_A_CFLAGS) -c -o $@ $@.iconv.cpp diff --git a/libs/JSystem/JStudio/JStudio_JStage/Makefile b/libs/JSystem/JStudio/JStudio_JStage/Makefile index 841a288d1f..f0116da19f 100644 --- a/libs/JSystem/JStudio/JStudio_JStage/Makefile +++ b/libs/JSystem/JStudio/JStudio_JStage/Makefile @@ -36,6 +36,6 @@ $(BUILD_DIR)/libJStudio_JStage.a: $(LIBJSTUDIO_JSTAGE_A_O_FILES) $(BUILD_DIR)/libs/JSystem/JStudio/JStudio_JStage/%.o: libs/JSystem/JStudio/JStudio_JStage/%.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) $(LIBJSTUDIO_JSTAGE_A_CFLAGS) -c -o $@ $@.iconv.cpp |