mirror of
https://github.com/encounter/tp.git
synced 2026-07-11 06:18:46 -07: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:
Jasper St. Pierre
co-authored by
lepelog
lepelog
parent
9799fadfe8
commit
462d71cbef
@@ -43,7 +43,7 @@ $(M138_TARGET): $(M138_O_FILES) $(M138_LIBS)
|
||||
$(BUILD_DIR)/rel/d/a/b/d_a_b_bh/%.o: rel/d/a/b/d_a_b_bh/%.cpp
|
||||
@echo [138] building $@
|
||||
@mkdir -p $(@D)
|
||||
@iconv -f UTF-8 -t SHIFT-JIS -o $@.iconv.cpp $<
|
||||
@iconv -f UTF-8 -t CP932 < $< > $@.iconv.cpp
|
||||
@$(CC) $(CFLAGS) $(M138_CFLAGS) -c -o $@ $@.iconv.cpp
|
||||
|
||||
|
||||
|
||||
@@ -43,7 +43,7 @@ $(M139_TARGET): $(M139_O_FILES) $(M139_LIBS)
|
||||
$(BUILD_DIR)/rel/d/a/b/d_a_b_bq/%.o: rel/d/a/b/d_a_b_bq/%.cpp
|
||||
@echo [139] building $@
|
||||
@mkdir -p $(@D)
|
||||
@iconv -f UTF-8 -t SHIFT-JIS -o $@.iconv.cpp $<
|
||||
@iconv -f UTF-8 -t CP932 < $< > $@.iconv.cpp
|
||||
@$(CC) $(CFLAGS) $(M139_CFLAGS) -c -o $@ $@.iconv.cpp
|
||||
|
||||
|
||||
|
||||
@@ -43,7 +43,7 @@ $(M140_TARGET): $(M140_O_FILES) $(M140_LIBS)
|
||||
$(BUILD_DIR)/rel/d/a/b/d_a_b_dr/%.o: rel/d/a/b/d_a_b_dr/%.cpp
|
||||
@echo [140] building $@
|
||||
@mkdir -p $(@D)
|
||||
@iconv -f UTF-8 -t SHIFT-JIS -o $@.iconv.cpp $<
|
||||
@iconv -f UTF-8 -t CP932 < $< > $@.iconv.cpp
|
||||
@$(CC) $(CFLAGS) $(M140_CFLAGS) -c -o $@ $@.iconv.cpp
|
||||
|
||||
|
||||
|
||||
@@ -43,7 +43,7 @@ $(M141_TARGET): $(M141_O_FILES) $(M141_LIBS)
|
||||
$(BUILD_DIR)/rel/d/a/b/d_a_b_dre/%.o: rel/d/a/b/d_a_b_dre/%.cpp
|
||||
@echo [141] building $@
|
||||
@mkdir -p $(@D)
|
||||
@iconv -f UTF-8 -t SHIFT-JIS -o $@.iconv.cpp $<
|
||||
@iconv -f UTF-8 -t CP932 < $< > $@.iconv.cpp
|
||||
@$(CC) $(CFLAGS) $(M141_CFLAGS) -c -o $@ $@.iconv.cpp
|
||||
|
||||
|
||||
|
||||
@@ -43,7 +43,7 @@ $(M142_TARGET): $(M142_O_FILES) $(M142_LIBS)
|
||||
$(BUILD_DIR)/rel/d/a/b/d_a_b_ds/%.o: rel/d/a/b/d_a_b_ds/%.cpp
|
||||
@echo [142] building $@
|
||||
@mkdir -p $(@D)
|
||||
@iconv -f UTF-8 -t SHIFT-JIS -o $@.iconv.cpp $<
|
||||
@iconv -f UTF-8 -t CP932 < $< > $@.iconv.cpp
|
||||
@$(CC) $(CFLAGS) $(M142_CFLAGS) -c -o $@ $@.iconv.cpp
|
||||
|
||||
|
||||
|
||||
@@ -43,7 +43,7 @@ $(M143_TARGET): $(M143_O_FILES) $(M143_LIBS)
|
||||
$(BUILD_DIR)/rel/d/a/b/d_a_b_gg/%.o: rel/d/a/b/d_a_b_gg/%.cpp
|
||||
@echo [143] building $@
|
||||
@mkdir -p $(@D)
|
||||
@iconv -f UTF-8 -t SHIFT-JIS -o $@.iconv.cpp $<
|
||||
@iconv -f UTF-8 -t CP932 < $< > $@.iconv.cpp
|
||||
@$(CC) $(CFLAGS) $(M143_CFLAGS) -c -o $@ $@.iconv.cpp
|
||||
|
||||
|
||||
|
||||
@@ -43,7 +43,7 @@ $(M144_TARGET): $(M144_O_FILES) $(M144_LIBS)
|
||||
$(BUILD_DIR)/rel/d/a/b/d_a_b_gm/%.o: rel/d/a/b/d_a_b_gm/%.cpp
|
||||
@echo [144] building $@
|
||||
@mkdir -p $(@D)
|
||||
@iconv -f UTF-8 -t SHIFT-JIS -o $@.iconv.cpp $<
|
||||
@iconv -f UTF-8 -t CP932 < $< > $@.iconv.cpp
|
||||
@$(CC) $(CFLAGS) $(M144_CFLAGS) -c -o $@ $@.iconv.cpp
|
||||
|
||||
|
||||
|
||||
@@ -43,7 +43,7 @@ $(M145_TARGET): $(M145_O_FILES) $(M145_LIBS)
|
||||
$(BUILD_DIR)/rel/d/a/b/d_a_b_gnd/%.o: rel/d/a/b/d_a_b_gnd/%.cpp
|
||||
@echo [145] building $@
|
||||
@mkdir -p $(@D)
|
||||
@iconv -f UTF-8 -t SHIFT-JIS -o $@.iconv.cpp $<
|
||||
@iconv -f UTF-8 -t CP932 < $< > $@.iconv.cpp
|
||||
@$(CC) $(CFLAGS) $(M145_CFLAGS) -c -o $@ $@.iconv.cpp
|
||||
|
||||
|
||||
|
||||
@@ -43,7 +43,7 @@ $(M146_TARGET): $(M146_O_FILES) $(M146_LIBS)
|
||||
$(BUILD_DIR)/rel/d/a/b/d_a_b_go/%.o: rel/d/a/b/d_a_b_go/%.cpp
|
||||
@echo [146] building $@
|
||||
@mkdir -p $(@D)
|
||||
@iconv -f UTF-8 -t SHIFT-JIS -o $@.iconv.cpp $<
|
||||
@iconv -f UTF-8 -t CP932 < $< > $@.iconv.cpp
|
||||
@$(CC) $(CFLAGS) $(M146_CFLAGS) -c -o $@ $@.iconv.cpp
|
||||
|
||||
|
||||
|
||||
@@ -43,7 +43,7 @@ $(M147_TARGET): $(M147_O_FILES) $(M147_LIBS)
|
||||
$(BUILD_DIR)/rel/d/a/b/d_a_b_gos/%.o: rel/d/a/b/d_a_b_gos/%.cpp
|
||||
@echo [147] building $@
|
||||
@mkdir -p $(@D)
|
||||
@iconv -f UTF-8 -t SHIFT-JIS -o $@.iconv.cpp $<
|
||||
@iconv -f UTF-8 -t CP932 < $< > $@.iconv.cpp
|
||||
@$(CC) $(CFLAGS) $(M147_CFLAGS) -c -o $@ $@.iconv.cpp
|
||||
|
||||
|
||||
|
||||
@@ -43,7 +43,7 @@ $(M148_TARGET): $(M148_O_FILES) $(M148_LIBS)
|
||||
$(BUILD_DIR)/rel/d/a/b/d_a_b_mgn/%.o: rel/d/a/b/d_a_b_mgn/%.cpp
|
||||
@echo [148] building $@
|
||||
@mkdir -p $(@D)
|
||||
@iconv -f UTF-8 -t SHIFT-JIS -o $@.iconv.cpp $<
|
||||
@iconv -f UTF-8 -t CP932 < $< > $@.iconv.cpp
|
||||
@$(CC) $(CFLAGS) $(M148_CFLAGS) -c -o $@ $@.iconv.cpp
|
||||
|
||||
|
||||
|
||||
@@ -43,7 +43,7 @@ $(M149_TARGET): $(M149_O_FILES) $(M149_LIBS)
|
||||
$(BUILD_DIR)/rel/d/a/b/d_a_b_ob/%.o: rel/d/a/b/d_a_b_ob/%.cpp
|
||||
@echo [149] building $@
|
||||
@mkdir -p $(@D)
|
||||
@iconv -f UTF-8 -t SHIFT-JIS -o $@.iconv.cpp $<
|
||||
@iconv -f UTF-8 -t CP932 < $< > $@.iconv.cpp
|
||||
@$(CC) $(CFLAGS) $(M149_CFLAGS) -c -o $@ $@.iconv.cpp
|
||||
|
||||
|
||||
|
||||
@@ -43,7 +43,7 @@ $(M150_TARGET): $(M150_O_FILES) $(M150_LIBS)
|
||||
$(BUILD_DIR)/rel/d/a/b/d_a_b_oh/%.o: rel/d/a/b/d_a_b_oh/%.cpp
|
||||
@echo [150] building $@
|
||||
@mkdir -p $(@D)
|
||||
@iconv -f UTF-8 -t SHIFT-JIS -o $@.iconv.cpp $<
|
||||
@iconv -f UTF-8 -t CP932 < $< > $@.iconv.cpp
|
||||
@$(CC) $(CFLAGS) $(M150_CFLAGS) -c -o $@ $@.iconv.cpp
|
||||
|
||||
|
||||
|
||||
@@ -41,7 +41,7 @@ $(M151_TARGET): $(M151_O_FILES) $(M151_LIBS)
|
||||
$(BUILD_DIR)/rel/d/a/b/d_a_b_oh2/%.o: rel/d/a/b/d_a_b_oh2/%.cpp
|
||||
@echo [151] building $@
|
||||
@mkdir -p $(@D)
|
||||
@iconv -f UTF-8 -t SHIFT-JIS -o $@.iconv.cpp $<
|
||||
@iconv -f UTF-8 -t CP932 < $< > $@.iconv.cpp
|
||||
@$(CC) $(CFLAGS) $(M151_CFLAGS) -c -o $@ $@.iconv.cpp
|
||||
|
||||
|
||||
|
||||
@@ -43,7 +43,7 @@ $(M152_TARGET): $(M152_O_FILES) $(M152_LIBS)
|
||||
$(BUILD_DIR)/rel/d/a/b/d_a_b_tn/%.o: rel/d/a/b/d_a_b_tn/%.cpp
|
||||
@echo [152] building $@
|
||||
@mkdir -p $(@D)
|
||||
@iconv -f UTF-8 -t SHIFT-JIS -o $@.iconv.cpp $<
|
||||
@iconv -f UTF-8 -t CP932 < $< > $@.iconv.cpp
|
||||
@$(CC) $(CFLAGS) $(M152_CFLAGS) -c -o $@ $@.iconv.cpp
|
||||
|
||||
|
||||
|
||||
@@ -43,7 +43,7 @@ $(M153_TARGET): $(M153_O_FILES) $(M153_LIBS)
|
||||
$(BUILD_DIR)/rel/d/a/b/d_a_b_yo/%.o: rel/d/a/b/d_a_b_yo/%.cpp
|
||||
@echo [153] building $@
|
||||
@mkdir -p $(@D)
|
||||
@iconv -f UTF-8 -t SHIFT-JIS -o $@.iconv.cpp $<
|
||||
@iconv -f UTF-8 -t CP932 < $< > $@.iconv.cpp
|
||||
@$(CC) $(CFLAGS) $(M153_CFLAGS) -c -o $@ $@.iconv.cpp
|
||||
|
||||
|
||||
|
||||
@@ -43,7 +43,7 @@ $(M154_TARGET): $(M154_O_FILES) $(M154_LIBS)
|
||||
$(BUILD_DIR)/rel/d/a/b/d_a_b_yo_ice/%.o: rel/d/a/b/d_a_b_yo_ice/%.cpp
|
||||
@echo [154] building $@
|
||||
@mkdir -p $(@D)
|
||||
@iconv -f UTF-8 -t SHIFT-JIS -o $@.iconv.cpp $<
|
||||
@iconv -f UTF-8 -t CP932 < $< > $@.iconv.cpp
|
||||
@$(CC) $(CFLAGS) $(M154_CFLAGS) -c -o $@ $@.iconv.cpp
|
||||
|
||||
|
||||
|
||||
@@ -43,7 +43,7 @@ $(M155_TARGET): $(M155_O_FILES) $(M155_LIBS)
|
||||
$(BUILD_DIR)/rel/d/a/b/d_a_b_zant/%.o: rel/d/a/b/d_a_b_zant/%.cpp
|
||||
@echo [155] building $@
|
||||
@mkdir -p $(@D)
|
||||
@iconv -f UTF-8 -t SHIFT-JIS -o $@.iconv.cpp $<
|
||||
@iconv -f UTF-8 -t CP932 < $< > $@.iconv.cpp
|
||||
@$(CC) $(CFLAGS) $(M155_CFLAGS) -c -o $@ $@.iconv.cpp
|
||||
|
||||
|
||||
|
||||
@@ -41,7 +41,7 @@ $(M156_TARGET): $(M156_O_FILES) $(M156_LIBS)
|
||||
$(BUILD_DIR)/rel/d/a/b/d_a_b_zant_magic/%.o: rel/d/a/b/d_a_b_zant_magic/%.cpp
|
||||
@echo [156] building $@
|
||||
@mkdir -p $(@D)
|
||||
@iconv -f UTF-8 -t SHIFT-JIS -o $@.iconv.cpp $<
|
||||
@iconv -f UTF-8 -t CP932 < $< > $@.iconv.cpp
|
||||
@$(CC) $(CFLAGS) $(M156_CFLAGS) -c -o $@ $@.iconv.cpp
|
||||
|
||||
|
||||
|
||||
@@ -43,7 +43,7 @@ $(M157_TARGET): $(M157_O_FILES) $(M157_LIBS)
|
||||
$(BUILD_DIR)/rel/d/a/b/d_a_b_zant_mobile/%.o: rel/d/a/b/d_a_b_zant_mobile/%.cpp
|
||||
@echo [157] building $@
|
||||
@mkdir -p $(@D)
|
||||
@iconv -f UTF-8 -t SHIFT-JIS -o $@.iconv.cpp $<
|
||||
@iconv -f UTF-8 -t CP932 < $< > $@.iconv.cpp
|
||||
@$(CC) $(CFLAGS) $(M157_CFLAGS) -c -o $@ $@.iconv.cpp
|
||||
|
||||
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user