mirror of
https://github.com/zeldaret/tp
synced 2026-07-10 23:22:01 -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
@@ -24,6 +24,6 @@ $(BUILD_DIR)/libai.a: $(LIBAI_A_O_FILES)
|
||||
$(BUILD_DIR)/libs/dolphin/ai/%.o: libs/dolphin/ai/%.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) $(LIBAI_A_CFLAGS) -c -o $@ $@.iconv.cpp
|
||||
|
||||
|
||||
@@ -26,6 +26,6 @@ $(BUILD_DIR)/libar.a: $(LIBAR_A_O_FILES)
|
||||
$(BUILD_DIR)/libs/dolphin/ar/%.o: libs/dolphin/ar/%.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) $(LIBAR_A_CFLAGS) -c -o $@ $@.iconv.cpp
|
||||
|
||||
|
||||
@@ -24,6 +24,6 @@ $(BUILD_DIR)/libbase.a: $(LIBBASE_A_O_FILES)
|
||||
$(BUILD_DIR)/libs/dolphin/base/%.o: libs/dolphin/base/%.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) $(LIBBASE_A_CFLAGS) -c -o $@ $@.iconv.cpp
|
||||
|
||||
|
||||
@@ -50,6 +50,6 @@ $(BUILD_DIR)/libcard.a: $(LIBCARD_A_O_FILES)
|
||||
$(BUILD_DIR)/libs/dolphin/card/%.o: libs/dolphin/card/%.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) $(LIBCARD_A_CFLAGS) -c -o $@ $@.iconv.cpp
|
||||
|
||||
|
||||
@@ -24,6 +24,6 @@ $(BUILD_DIR)/libdb.a: $(LIBDB_A_O_FILES)
|
||||
$(BUILD_DIR)/libs/dolphin/db/%.o: libs/dolphin/db/%.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) $(LIBDB_A_CFLAGS) -c -o $@ $@.iconv.cpp
|
||||
|
||||
|
||||
@@ -28,6 +28,6 @@ $(BUILD_DIR)/libdsp.a: $(LIBDSP_A_O_FILES)
|
||||
$(BUILD_DIR)/libs/dolphin/dsp/%.o: libs/dolphin/dsp/%.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) $(LIBDSP_A_CFLAGS) -c -o $@ $@.iconv.cpp
|
||||
|
||||
|
||||
@@ -38,6 +38,6 @@ $(BUILD_DIR)/libdvd.a: $(LIBDVD_A_O_FILES)
|
||||
$(BUILD_DIR)/libs/dolphin/dvd/%.o: libs/dolphin/dvd/%.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) $(LIBDVD_A_CFLAGS) -c -o $@ $@.iconv.cpp
|
||||
|
||||
|
||||
@@ -26,6 +26,6 @@ $(BUILD_DIR)/libgd.a: $(LIBGD_A_O_FILES)
|
||||
$(BUILD_DIR)/libs/dolphin/gd/%.o: libs/dolphin/gd/%.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) $(LIBGD_A_CFLAGS) -c -o $@ $@.iconv.cpp
|
||||
|
||||
|
||||
@@ -30,6 +30,6 @@ $(BUILD_DIR)/libgf.a: $(LIBGF_A_O_FILES)
|
||||
$(BUILD_DIR)/libs/dolphin/gf/%.o: libs/dolphin/gf/%.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) $(LIBGF_A_CFLAGS) -c -o $@ $@.iconv.cpp
|
||||
|
||||
|
||||
@@ -7,12 +7,6 @@
|
||||
#include "dol2asm.h"
|
||||
#include "dolphin/types.h"
|
||||
|
||||
//
|
||||
// Forward References:
|
||||
//
|
||||
|
||||
extern "C" void GXCallDisplayList();
|
||||
|
||||
//
|
||||
// External References:
|
||||
//
|
||||
@@ -29,7 +23,7 @@ extern "C" extern void* __GXData;
|
||||
#pragma push
|
||||
#pragma optimization_level 0
|
||||
#pragma optimizewithasm off
|
||||
asm void GXCallDisplayList() {
|
||||
asm void GXCallDisplayList(const void* pDL, u32 size) {
|
||||
nofralloc
|
||||
#include "asm/dolphin/gx/GXDisplayList/GXCallDisplayList.s"
|
||||
}
|
||||
|
||||
@@ -50,6 +50,6 @@ $(BUILD_DIR)/libgx.a: $(LIBGX_A_O_FILES)
|
||||
$(BUILD_DIR)/libs/dolphin/gx/%.o: libs/dolphin/gx/%.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) $(LIBGX_A_CFLAGS) -c -o $@ $@.iconv.cpp
|
||||
|
||||
|
||||
@@ -32,6 +32,6 @@ $(BUILD_DIR)/libmtx.a: $(LIBMTX_A_O_FILES)
|
||||
$(BUILD_DIR)/libs/dolphin/mtx/%.o: libs/dolphin/mtx/%.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) $(LIBMTX_A_CFLAGS) -c -o $@ $@.iconv.cpp
|
||||
|
||||
|
||||
@@ -68,6 +68,6 @@ $(BUILD_DIR)/libos.a: $(LIBOS_A_O_FILES)
|
||||
$(BUILD_DIR)/libs/dolphin/os/%.o: libs/dolphin/os/%.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) $(LIBOS_A_CFLAGS) -c -o $@ $@.iconv.cpp
|
||||
|
||||
|
||||
@@ -26,6 +26,6 @@ $(BUILD_DIR)/libpad.a: $(LIBPAD_A_O_FILES)
|
||||
$(BUILD_DIR)/libs/dolphin/pad/%.o: libs/dolphin/pad/%.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) $(LIBPAD_A_CFLAGS) -c -o $@ $@.iconv.cpp
|
||||
|
||||
|
||||
@@ -26,6 +26,6 @@ $(BUILD_DIR)/libsi.a: $(LIBSI_A_O_FILES)
|
||||
$(BUILD_DIR)/libs/dolphin/si/%.o: libs/dolphin/si/%.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) $(LIBSI_A_CFLAGS) -c -o $@ $@.iconv.cpp
|
||||
|
||||
|
||||
@@ -24,6 +24,6 @@ $(BUILD_DIR)/libvi.a: $(LIBVI_A_O_FILES)
|
||||
$(BUILD_DIR)/libs/dolphin/vi/%.o: libs/dolphin/vi/%.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) $(LIBVI_A_CFLAGS) -c -o $@ $@.iconv.cpp
|
||||
|
||||
|
||||
Reference in New Issue
Block a user