summaryrefslogtreecommitdiff
path: root/libs/JSystem
diff options
context:
space:
mode:
authorJonathan Wase <jonathan@familjenwase.se>2021-12-02 23:38:37 +0100
committerGitHub <noreply@github.com>2021-12-02 23:38:37 +0100
commitbc428f7f65b97cc9035aed1dc1b71c54ff2e6c3d (patch)
treea9ee5b38a79336db38dd126bec4b538a9a541bbd /libs/JSystem
parent5f187a0776487afa64cb0993b1e96bb5ee115efd (diff)
Clean up and improvements to tools (#163)
* moved elf2dol * removed postprocess.py * removed vtables.py * find_unused_asm.py * removed section2cpp.py * removed splitter/* * fixed symbol names due to iconv file rename * fixed problem building RELs caused by #160 * improved performance of a few python tools * added new tool for finding conflict when not OK * added ./tp setup * don't install dol2asm dependecies with requirements.txt * format and check for imports * remove unused tools/difftools.py * fixed ignore to include elf2dol * fix compiler patcher * ok-check now creates the patched compiler at mwcceppc_patched.exe * Add new command to copy the build folder to the expected folder * 'make clean' will now only clean main.dol stuff. (added clean_rels and clean_all) * './tp pull-request' and './tp check' now doesn't include RELs by default. Use '--rels' to include them in the process. * './tp remove-unused-asm --check' added, exitcode 0==no files, 1==exists files Co-authored-by: Julgodis <>
Diffstat (limited to 'libs/JSystem')
-rw-r--r--libs/JSystem/J2DGraph/Makefile4
-rw-r--r--libs/JSystem/J3DGraphAnimator/Makefile4
-rw-r--r--libs/JSystem/J3DGraphBase/Makefile4
-rw-r--r--libs/JSystem/J3DGraphLoader/Makefile4
-rw-r--r--libs/JSystem/J3DU/Makefile4
-rw-r--r--libs/JSystem/JAudio2/Makefile4
-rw-r--r--libs/JSystem/JFramework/Makefile4
-rw-r--r--libs/JSystem/JGadget/Makefile4
-rw-r--r--libs/JSystem/JKernel/Makefile4
-rw-r--r--libs/JSystem/JMath/Makefile4
-rw-r--r--libs/JSystem/JMessage/Makefile4
-rw-r--r--libs/JSystem/JParticle/Makefile4
-rw-r--r--libs/JSystem/JStage/Makefile4
-rw-r--r--libs/JSystem/JStudio/JStudio/Makefile4
-rw-r--r--libs/JSystem/JStudio/JStudio_JAudio2/Makefile4
-rw-r--r--libs/JSystem/JStudio/JStudio_JParticle/Makefile4
-rw-r--r--libs/JSystem/JStudio/JStudio_JStage/Makefile4
-rw-r--r--libs/JSystem/JSupport/Makefile4
-rw-r--r--libs/JSystem/JUtility/Makefile4
19 files changed, 38 insertions, 38 deletions
diff --git a/libs/JSystem/J2DGraph/Makefile b/libs/JSystem/J2DGraph/Makefile
index 2cf91e51b3..d3fc92ef46 100644
--- a/libs/JSystem/J2DGraph/Makefile
+++ b/libs/JSystem/J2DGraph/Makefile
@@ -58,6 +58,6 @@ $(BUILD_DIR)/libJ2DGraph.a: $(LIBJ2DGRAPH_A_O_FILES)
$(BUILD_DIR)/libs/JSystem/J2DGraph/%.o: libs/JSystem/J2DGraph/%.cpp
@mkdir -p $(@D)
@echo building... $<
- @iconv -f UTF-8 -t CP932 < $< > $@.iconv.cpp
- @$(CC) $(CFLAGS) $(LIBJ2DGRAPH_A_CFLAGS) -c -o $@ $@.iconv.cpp
+ @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp
+ @$(CC) $(CFLAGS) $(LIBJ2DGRAPH_A_CFLAGS) -c -o $@ $(basename $@).cpp
diff --git a/libs/JSystem/J3DGraphAnimator/Makefile b/libs/JSystem/J3DGraphAnimator/Makefile
index febf03726b..cf3389d85e 100644
--- a/libs/JSystem/J3DGraphAnimator/Makefile
+++ b/libs/JSystem/J3DGraphAnimator/Makefile
@@ -44,6 +44,6 @@ $(BUILD_DIR)/libJ3DGraphAnimator.a: $(LIBJ3DGRAPHANIMATOR_A_O_FILES)
$(BUILD_DIR)/libs/JSystem/J3DGraphAnimator/%.o: libs/JSystem/J3DGraphAnimator/%.cpp
@mkdir -p $(@D)
@echo building... $<
- @iconv -f UTF-8 -t CP932 < $< > $@.iconv.cpp
- @$(CC) $(CFLAGS) $(LIBJ3DGRAPHANIMATOR_A_CFLAGS) -c -o $@ $@.iconv.cpp
+ @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp
+ @$(CC) $(CFLAGS) $(LIBJ3DGRAPHANIMATOR_A_CFLAGS) -c -o $@ $(basename $@).cpp
diff --git a/libs/JSystem/J3DGraphBase/Makefile b/libs/JSystem/J3DGraphBase/Makefile
index ba29c56e49..82af2f83b3 100644
--- a/libs/JSystem/J3DGraphBase/Makefile
+++ b/libs/JSystem/J3DGraphBase/Makefile
@@ -50,6 +50,6 @@ $(BUILD_DIR)/libJ3DGraphBase.a: $(LIBJ3DGRAPHBASE_A_O_FILES)
$(BUILD_DIR)/libs/JSystem/J3DGraphBase/%.o: libs/JSystem/J3DGraphBase/%.cpp
@mkdir -p $(@D)
@echo building... $<
- @iconv -f UTF-8 -t CP932 < $< > $@.iconv.cpp
- @$(CC) $(CFLAGS) $(LIBJ3DGRAPHBASE_A_CFLAGS) -c -o $@ $@.iconv.cpp
+ @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp
+ @$(CC) $(CFLAGS) $(LIBJ3DGRAPHBASE_A_CFLAGS) -c -o $@ $(basename $@).cpp
diff --git a/libs/JSystem/J3DGraphLoader/Makefile b/libs/JSystem/J3DGraphLoader/Makefile
index cb2ac6536d..01b3dee5bc 100644
--- a/libs/JSystem/J3DGraphLoader/Makefile
+++ b/libs/JSystem/J3DGraphLoader/Makefile
@@ -38,6 +38,6 @@ $(BUILD_DIR)/libJ3DGraphLoader.a: $(LIBJ3DGRAPHLOADER_A_O_FILES)
$(BUILD_DIR)/libs/JSystem/J3DGraphLoader/%.o: libs/JSystem/J3DGraphLoader/%.cpp
@mkdir -p $(@D)
@echo building... $<
- @iconv -f UTF-8 -t CP932 < $< > $@.iconv.cpp
- @$(CC) $(CFLAGS) $(LIBJ3DGRAPHLOADER_A_CFLAGS) -c -o $@ $@.iconv.cpp
+ @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp
+ @$(CC) $(CFLAGS) $(LIBJ3DGRAPHLOADER_A_CFLAGS) -c -o $@ $(basename $@).cpp
diff --git a/libs/JSystem/J3DU/Makefile b/libs/JSystem/J3DU/Makefile
index cb6818b81a..5d551ad846 100644
--- a/libs/JSystem/J3DU/Makefile
+++ b/libs/JSystem/J3DU/Makefile
@@ -26,6 +26,6 @@ $(BUILD_DIR)/libJ3DU.a: $(LIBJ3DU_A_O_FILES)
$(BUILD_DIR)/libs/JSystem/J3DU/%.o: libs/JSystem/J3DU/%.cpp
@mkdir -p $(@D)
@echo building... $<
- @iconv -f UTF-8 -t CP932 < $< > $@.iconv.cpp
- @$(CC) $(CFLAGS) $(LIBJ3DU_A_CFLAGS) -c -o $@ $@.iconv.cpp
+ @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp
+ @$(CC) $(CFLAGS) $(LIBJ3DU_A_CFLAGS) -c -o $@ $(basename $@).cpp
diff --git a/libs/JSystem/JAudio2/Makefile b/libs/JSystem/JAudio2/Makefile
index a972465840..28a05a45da 100644
--- a/libs/JSystem/JAudio2/Makefile
+++ b/libs/JSystem/JAudio2/Makefile
@@ -158,6 +158,6 @@ $(BUILD_DIR)/libJAudio2.a: $(LIBJAUDIO2_A_O_FILES)
$(BUILD_DIR)/libs/JSystem/JAudio2/%.o: libs/JSystem/JAudio2/%.cpp
@mkdir -p $(@D)
@echo building... $<
- @iconv -f UTF-8 -t CP932 < $< > $@.iconv.cpp
- @$(CC) $(CFLAGS) $(LIBJAUDIO2_A_CFLAGS) -c -o $@ $@.iconv.cpp
+ @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp
+ @$(CC) $(CFLAGS) $(LIBJAUDIO2_A_CFLAGS) -c -o $@ $(basename $@).cpp
diff --git a/libs/JSystem/JFramework/Makefile b/libs/JSystem/JFramework/Makefile
index 3b33a534d8..8df842d47a 100644
--- a/libs/JSystem/JFramework/Makefile
+++ b/libs/JSystem/JFramework/Makefile
@@ -26,6 +26,6 @@ $(BUILD_DIR)/libJFramework.a: $(LIBJFRAMEWORK_A_O_FILES)
$(BUILD_DIR)/libs/JSystem/JFramework/%.o: libs/JSystem/JFramework/%.cpp
@mkdir -p $(@D)
@echo building... $<
- @iconv -f UTF-8 -t CP932 < $< > $@.iconv.cpp
- @$(CC) $(CFLAGS) $(LIBJFRAMEWORK_A_CFLAGS) -c -o $@ $@.iconv.cpp
+ @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp
+ @$(CC) $(CFLAGS) $(LIBJFRAMEWORK_A_CFLAGS) -c -o $@ $(basename $@).cpp
diff --git a/libs/JSystem/JGadget/Makefile b/libs/JSystem/JGadget/Makefile
index 1d3039b99f..68f5c8eeb6 100644
--- a/libs/JSystem/JGadget/Makefile
+++ b/libs/JSystem/JGadget/Makefile
@@ -28,6 +28,6 @@ $(BUILD_DIR)/libJGadget.a: $(LIBJGADGET_A_O_FILES)
$(BUILD_DIR)/libs/JSystem/JGadget/%.o: libs/JSystem/JGadget/%.cpp
@mkdir -p $(@D)
@echo building... $<
- @iconv -f UTF-8 -t CP932 < $< > $@.iconv.cpp
- @$(CC) $(CFLAGS) $(LIBJGADGET_A_CFLAGS) -c -o $@ $@.iconv.cpp
+ @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp
+ @$(CC) $(CFLAGS) $(LIBJGADGET_A_CFLAGS) -c -o $@ $(basename $@).cpp
diff --git a/libs/JSystem/JKernel/Makefile b/libs/JSystem/JKernel/Makefile
index 68065da495..3e1c472dce 100644
--- a/libs/JSystem/JKernel/Makefile
+++ b/libs/JSystem/JKernel/Makefile
@@ -72,6 +72,6 @@ $(BUILD_DIR)/libJKernel.a: $(LIBJKERNEL_A_O_FILES)
$(BUILD_DIR)/libs/JSystem/JKernel/%.o: libs/JSystem/JKernel/%.cpp
@mkdir -p $(@D)
@echo building... $<
- @iconv -f UTF-8 -t CP932 < $< > $@.iconv.cpp
- @$(CC) $(CFLAGS) $(LIBJKERNEL_A_CFLAGS) -c -o $@ $@.iconv.cpp
+ @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp
+ @$(CC) $(CFLAGS) $(LIBJKERNEL_A_CFLAGS) -c -o $@ $(basename $@).cpp
diff --git a/libs/JSystem/JMath/Makefile b/libs/JSystem/JMath/Makefile
index 6f44bfa654..abb8024475 100644
--- a/libs/JSystem/JMath/Makefile
+++ b/libs/JSystem/JMath/Makefile
@@ -28,6 +28,6 @@ $(BUILD_DIR)/libJMath.a: $(LIBJMATH_A_O_FILES)
$(BUILD_DIR)/libs/JSystem/JMath/%.o: libs/JSystem/JMath/%.cpp
@mkdir -p $(@D)
@echo building... $<
- @iconv -f UTF-8 -t CP932 < $< > $@.iconv.cpp
- @$(CC) $(CFLAGS) $(LIBJMATH_A_CFLAGS) -c -o $@ $@.iconv.cpp
+ @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp
+ @$(CC) $(CFLAGS) $(LIBJMATH_A_CFLAGS) -c -o $@ $(basename $@).cpp
diff --git a/libs/JSystem/JMessage/Makefile b/libs/JSystem/JMessage/Makefile
index 6958df60eb..f5755e34f1 100644
--- a/libs/JSystem/JMessage/Makefile
+++ b/libs/JSystem/JMessage/Makefile
@@ -32,6 +32,6 @@ $(BUILD_DIR)/libJMessage.a: $(LIBJMESSAGE_A_O_FILES)
$(BUILD_DIR)/libs/JSystem/JMessage/%.o: libs/JSystem/JMessage/%.cpp
@mkdir -p $(@D)
@echo building... $<
- @iconv -f UTF-8 -t CP932 < $< > $@.iconv.cpp
- @$(CC) $(CFLAGS) $(LIBJMESSAGE_A_CFLAGS) -c -o $@ $@.iconv.cpp
+ @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp
+ @$(CC) $(CFLAGS) $(LIBJMESSAGE_A_CFLAGS) -c -o $@ $(basename $@).cpp
diff --git a/libs/JSystem/JParticle/Makefile b/libs/JSystem/JParticle/Makefile
index 20dc432b1d..8f8c1a34f6 100644
--- a/libs/JSystem/JParticle/Makefile
+++ b/libs/JSystem/JParticle/Makefile
@@ -52,6 +52,6 @@ $(BUILD_DIR)/libJParticle.a: $(LIBJPARTICLE_A_O_FILES)
$(BUILD_DIR)/libs/JSystem/JParticle/%.o: libs/JSystem/JParticle/%.cpp
@mkdir -p $(@D)
@echo building... $<
- @iconv -f UTF-8 -t CP932 < $< > $@.iconv.cpp
- @$(CC) $(CFLAGS) $(LIBJPARTICLE_A_CFLAGS) -c -o $@ $@.iconv.cpp
+ @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp
+ @$(CC) $(CFLAGS) $(LIBJPARTICLE_A_CFLAGS) -c -o $@ $(basename $@).cpp
diff --git a/libs/JSystem/JStage/Makefile b/libs/JSystem/JStage/Makefile
index d7e2fb7c36..b6270b2528 100644
--- a/libs/JSystem/JStage/Makefile
+++ b/libs/JSystem/JStage/Makefile
@@ -36,6 +36,6 @@ $(BUILD_DIR)/libJStage.a: $(LIBJSTAGE_A_O_FILES)
$(BUILD_DIR)/libs/JSystem/JStage/%.o: libs/JSystem/JStage/%.cpp
@mkdir -p $(@D)
@echo building... $<
- @iconv -f UTF-8 -t CP932 < $< > $@.iconv.cpp
- @$(CC) $(CFLAGS) $(LIBJSTAGE_A_CFLAGS) -c -o $@ $@.iconv.cpp
+ @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp
+ @$(CC) $(CFLAGS) $(LIBJSTAGE_A_CFLAGS) -c -o $@ $(basename $@).cpp
diff --git a/libs/JSystem/JStudio/JStudio/Makefile b/libs/JSystem/JStudio/JStudio/Makefile
index c8f56e5b26..babd1d84de 100644
--- a/libs/JSystem/JStudio/JStudio/Makefile
+++ b/libs/JSystem/JStudio/JStudio/Makefile
@@ -54,6 +54,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 CP932 < $< > $@.iconv.cpp
- @$(CC) $(CFLAGS) $(LIBJSTUDIO_A_CFLAGS) -c -o $@ $@.iconv.cpp
+ @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp
+ @$(CC) $(CFLAGS) $(LIBJSTUDIO_A_CFLAGS) -c -o $@ $(basename $@).cpp
diff --git a/libs/JSystem/JStudio/JStudio_JAudio2/Makefile b/libs/JSystem/JStudio/JStudio_JAudio2/Makefile
index e1d7941579..5ec8a7cd29 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 CP932 < $< > $@.iconv.cpp
- @$(CC) $(CFLAGS) $(LIBJSTUDIO_JAUDIO2_A_CFLAGS) -c -o $@ $@.iconv.cpp
+ @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp
+ @$(CC) $(CFLAGS) $(LIBJSTUDIO_JAUDIO2_A_CFLAGS) -c -o $@ $(basename $@).cpp
diff --git a/libs/JSystem/JStudio/JStudio_JParticle/Makefile b/libs/JSystem/JStudio/JStudio_JParticle/Makefile
index 8bf67212e5..b8db51d5b9 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 CP932 < $< > $@.iconv.cpp
- @$(CC) $(CFLAGS) $(LIBJSTUDIO_JPARTICLE_A_CFLAGS) -c -o $@ $@.iconv.cpp
+ @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp
+ @$(CC) $(CFLAGS) $(LIBJSTUDIO_JPARTICLE_A_CFLAGS) -c -o $@ $(basename $@).cpp
diff --git a/libs/JSystem/JStudio/JStudio_JStage/Makefile b/libs/JSystem/JStudio/JStudio_JStage/Makefile
index f0116da19f..4c48f6ec89 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 CP932 < $< > $@.iconv.cpp
- @$(CC) $(CFLAGS) $(LIBJSTUDIO_JSTAGE_A_CFLAGS) -c -o $@ $@.iconv.cpp
+ @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp
+ @$(CC) $(CFLAGS) $(LIBJSTUDIO_JSTAGE_A_CFLAGS) -c -o $@ $(basename $@).cpp
diff --git a/libs/JSystem/JSupport/Makefile b/libs/JSystem/JSupport/Makefile
index 9961fb3e28..66b713ac18 100644
--- a/libs/JSystem/JSupport/Makefile
+++ b/libs/JSystem/JSupport/Makefile
@@ -30,6 +30,6 @@ $(BUILD_DIR)/libJSupport.a: $(LIBJSUPPORT_A_O_FILES)
$(BUILD_DIR)/libs/JSystem/JSupport/%.o: libs/JSystem/JSupport/%.cpp
@mkdir -p $(@D)
@echo building... $<
- @iconv -f UTF-8 -t CP932 < $< > $@.iconv.cpp
- @$(CC) $(CFLAGS) $(LIBJSUPPORT_A_CFLAGS) -c -o $@ $@.iconv.cpp
+ @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp
+ @$(CC) $(CFLAGS) $(LIBJSUPPORT_A_CFLAGS) -c -o $@ $(basename $@).cpp
diff --git a/libs/JSystem/JUtility/Makefile b/libs/JSystem/JUtility/Makefile
index e1b97dfd47..953ea3b208 100644
--- a/libs/JSystem/JUtility/Makefile
+++ b/libs/JSystem/JUtility/Makefile
@@ -62,6 +62,6 @@ $(BUILD_DIR)/libJUtility.a: $(LIBJUTILITY_A_O_FILES)
$(BUILD_DIR)/libs/JSystem/JUtility/%.o: libs/JSystem/JUtility/%.cpp
@mkdir -p $(@D)
@echo building... $<
- @iconv -f UTF-8 -t CP932 < $< > $@.iconv.cpp
- @$(CC) $(CFLAGS) $(LIBJUTILITY_A_CFLAGS) -c -o $@ $@.iconv.cpp
+ @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp
+ @$(CC) $(CFLAGS) $(LIBJUTILITY_A_CFLAGS) -c -o $@ $(basename $@).cpp