From e4c1bde3e7f1664aee53a403cfa30320d8a52bcd Mon Sep 17 00:00:00 2001 From: red031000 Date: Fri, 30 Jun 2023 00:59:37 +0100 Subject: [PATCH] libc to MSL_C --- Makefile | 6 +++--- arm9/CMakeLists.txt | 2 +- arm9/Makefile | 14 +++++++------- arm9/lib/{libc => MSL_C}/Makefile | 2 +- arm9/lib/{libc => MSL_C}/include/MSL.h | 0 .../lib/{libc => MSL_C}/include/MSL_Common_arith.h | 0 arm9/lib/{libc => MSL_C}/include/MSL_Common_rand.h | 0 arm9/lib/{libc => MSL_C}/include/ansi_params.h | 0 arm9/lib/{libc => MSL_C}/include/size_t.h | 0 arm9/lib/{libc => MSL_C}/include/string.h | 0 arm9/lib/{libc => MSL_C}/src/MSL_Common_arith.c | 0 arm9/lib/{libc => MSL_C}/src/MSL_Common_rand.c | 0 arm9/lib/Makefile | 8 ++++---- arm9/lib/NitroSDK/Makefile | 2 +- arm9/lib/libnns/Makefile | 2 +- m2ctx.sh | 2 +- 16 files changed, 19 insertions(+), 19 deletions(-) rename arm9/lib/{libc => MSL_C}/Makefile (87%) rename arm9/lib/{libc => MSL_C}/include/MSL.h (100%) rename arm9/lib/{libc => MSL_C}/include/MSL_Common_arith.h (100%) rename arm9/lib/{libc => MSL_C}/include/MSL_Common_rand.h (100%) rename arm9/lib/{libc => MSL_C}/include/ansi_params.h (100%) rename arm9/lib/{libc => MSL_C}/include/size_t.h (100%) rename arm9/lib/{libc => MSL_C}/include/string.h (100%) rename arm9/lib/{libc => MSL_C}/src/MSL_Common_arith.c (100%) rename arm9/lib/{libc => MSL_C}/src/MSL_Common_rand.c (100%) diff --git a/Makefile b/Makefile index 3f2d31f9e..2e5de7bba 100644 --- a/Makefile +++ b/Makefile @@ -104,7 +104,7 @@ OBJCOPY := $(CROSS)objcopy # ./tools/mwccarm/2.0/base/mwasmarm.exe -proc arm5te asm/arm9_thumb.s -o arm9.o MWASFLAGS = -proc arm5te -MWCFLAGS = -O4,p -gccext,on -proc arm946e -msgstyle gcc -gccinc -ipa file -fp soft -lang c99 -Cpp_exceptions off -i include -ir include-mw -ir arm9/lib/libc/include -ir arm9/lib/libnns/include -ir arm9/lib/NitroSDK/include -interworking -DFS_IMPLEMENT -enum int -D$(GAME_VERSION) -D$(GAME_LANGUAGE) -W all -W pedantic -W noimpl_signedunsigned -W noimplicitconv -W nounusedarg -W nomissingreturn -W error +MWCFLAGS = -O4,p -gccext,on -proc arm946e -msgstyle gcc -gccinc -ipa file -fp soft -lang c99 -Cpp_exceptions off -i include -ir include-mw -ir arm9/lib/MSL_C/include -ir arm9/lib/libnns/include -ir arm9/lib/NitroSDK/include -interworking -DFS_IMPLEMENT -enum int -D$(GAME_VERSION) -D$(GAME_LANGUAGE) -W all -W pedantic -W noimpl_signedunsigned -W noimplicitconv -W nounusedarg -W nomissingreturn -W error MWLDFLAGS = -map -nodead -w off -proc v5te -interworking -map -symtab -m _start -msgstyle gcc ####################### Other Tools ######################### @@ -132,7 +132,7 @@ TOOLS = $(foreach tool,$(TOOLBASE),$(TOOLS_DIR)/$(tool)/$(tool)$(EXE)) TOOLS: tools export LM_LICENSE_FILE := $(TOOLS_DIR)/mwccarm/license.dat -export MWCIncludes := arm9/lib/libc/include arm9/lib/NitroSDK/include arm9/lib/libnns/include +export MWCIncludes := arm9/lib/MSL_C/include arm9/lib/NitroSDK/include arm9/lib/libnns/include export MWLibraries := arm9/lib ######################### Targets ########################### @@ -199,7 +199,7 @@ patch_mwasmarm: tools/mwasmarm_patcher ALL_DIRS := $(BUILD_DIR) ifeq (,$(NODEP)) -$(BUILD_DIR)/%.o: dep = $(shell $(SCANINC) -I include -I include-mw -I arm9/lib/libc/include -I arm9/lib/libnns/include -I arm9/lib/NitroSDK/include $(filter $*.c,$(C_FILES)) $(filter $*.cpp,$(CXX_FILES)) $(filter $*.s,$(S_FILES))) +$(BUILD_DIR)/%.o: dep = $(shell $(SCANINC) -I include -I include-mw -I arm9/lib/MSL_C/include -I arm9/lib/libnns/include -I arm9/lib/NitroSDK/include $(filter $*.c,$(C_FILES)) $(filter $*.cpp,$(CXX_FILES)) $(filter $*.s,$(S_FILES))) else $(BUILD_DIR)/%.o: dep := endif diff --git a/arm9/CMakeLists.txt b/arm9/CMakeLists.txt index 61882f1ed..226f67cda 100644 --- a/arm9/CMakeLists.txt +++ b/arm9/CMakeLists.txt @@ -15,5 +15,5 @@ file(GLOB_RECURSE SOURCES "*.c" "*.cpp" "*.s") file(GLOB OVERLAY_INC overlays/*/include) add_executable(DP_Arm9 ${SOURCES}) -target_include_directories(DP_Arm9 PRIVATE ../include ../include-mw lib/NitroSDK/include lib/libc/include lib/libnns/include ${OVERLAY_INC} ../files) +target_include_directories(DP_Arm9 PRIVATE ../include ../include-mw lib/NitroSDK/include lib/MSL_C/include lib/libnns/include ${OVERLAY_INC} ../files) target_compile_definitions(DP_Arm9 PUBLIC __CLION_IDE__) diff --git a/arm9/Makefile b/arm9/Makefile index 8fda63961..64f9a5d2b 100644 --- a/arm9/Makefile +++ b/arm9/Makefile @@ -57,10 +57,10 @@ LD_TEMPLATE := ARM9-TS.lcf.template # Directories containing source files # sorting wildcards required for versions of make >= 3.8.2 and < 4.3 for consistent builds -SRC_DIRS := src lib lib/libnns/src lib/NitroSDK/src lib/libc/src $(sort $(wildcard overlays/*/src)) +SRC_DIRS := src lib lib/libnns/src lib/NitroSDK/src lib/MSL_C/src $(sort $(wildcard overlays/*/src)) ASM_DIRS := asm data files $(sort $(wildcard overlays/*/asm)) LIBASM_DIRS := lib/syscall -INCLUDE_RECURSIVE_DIRS := ../include-mw lib/libc/include lib/libnns/include lib/NitroSDK/include +INCLUDE_RECURSIVE_DIRS := ../include-mw lib/MSL_C/include lib/libnns/include lib/NitroSDK/include INCLUDE_DIRS := ../include $(sort $(wildcard overlays/*/include)) ../files C_FILES := $(foreach dir,$(SRC_DIRS),$(sort $(wildcard $(dir)/*.c))) @@ -149,7 +149,7 @@ TOOLS = $(foreach tool,$(TOOLBASE),$(TOOLS_DIR)/$(tool)/$(tool)$(EXE)) TOOLS: tools export LM_LICENSE_FILE := $(TOOLS_DIR)/mwccarm/license.dat -export MWCIncludes := $(CURDIR)/lib/libc/include $(CURDIR)/lib/NitroSDK/include $(CURDIR)/lib/libnns/include +export MWCIncludes := $(CURDIR)/lib/MSL_C/include $(CURDIR)/lib/NitroSDK/include $(CURDIR)/lib/libnns/include export MWLibraries := $(CURDIR)/lib ######################### Targets ########################### @@ -204,16 +204,16 @@ ALL_DIRS := $(BUILD_DIR) $(addprefix $(BUILD_DIR)/,$(SRC_DIRS) $(ASM_DIRS) $(LIB # TODO: Move out to lib/Makefile $(BUILD_DIR)/lib/%.o: MWCCVERSION = 1.2/sp2p3 -$(BUILD_DIR)/lib/%.o: MWCFLAGS = -O4,p -gccext,on -proc arm946e -msgstyle gcc -gccinc -fp soft -lang c99 -Cpp_exceptions off -i ../include -ir ../include-mw -ir lib/libc/include -ir lib/libnns/include -ir lib/NitroSDK/include -interworking -DFS_IMPLEMENT -enum int -D$(GAME_VERSION) -D$(GAME_LANGUAGE) -W all -W pedantic -W noimpl_signedunsigned -W noimplicitconv -W nounusedarg -W nomissingreturn -W error +$(BUILD_DIR)/lib/%.o: MWCFLAGS = -O4,p -gccext,on -proc arm946e -msgstyle gcc -gccinc -fp soft -lang c99 -Cpp_exceptions off -i ../include -ir ../include-mw -ir lib/MSL_C/include -ir lib/libnns/include -ir lib/NitroSDK/include -interworking -DFS_IMPLEMENT -enum int -D$(GAME_VERSION) -D$(GAME_LANGUAGE) -W all -W pedantic -W noimpl_signedunsigned -W noimplicitconv -W nounusedarg -W nomissingreturn -W error $(BUILD_DIR)/lib/libnns/%.o: MWCCVERSION = 1.2/sp3 -$(BUILD_DIR)/lib/libc/%.o: MWCCVERSION = 2.0/sp1 -$(BUILD_DIR)/lib/libc/%.o: MWCFLAGS += -ipa file +$(BUILD_DIR)/lib/MSL_C/%.o: MWCCVERSION = 2.0/sp1 +$(BUILD_DIR)/lib/MSL_C/%.o: MWCFLAGS += -ipa file ####################### Everything Else ###################### ifeq (,$(NODEP)) -$(BUILD_DIR)/%.o: dep = $(shell $(SCANINC) -I ../include -I ../include-mw -I lib/libc/include -I lib/libnns/include -I lib/NitroSDK/include $(filter $*.c,$(C_FILES)) $(filter $*.cpp,$(CXX_FILES)) $(filter $*.s,$(S_FILES)) $(filter $*.s,$(LIBS_FILES))) +$(BUILD_DIR)/%.o: dep = $(shell $(SCANINC) -I ../include -I ../include-mw -I lib/MSL_C/include -I lib/libnns/include -I lib/NitroSDK/include $(filter $*.c,$(C_FILES)) $(filter $*.cpp,$(CXX_FILES)) $(filter $*.s,$(S_FILES)) $(filter $*.s,$(LIBS_FILES))) else $(BUILD_DIR)/%.o: dep := endif diff --git a/arm9/lib/libc/Makefile b/arm9/lib/MSL_C/Makefile similarity index 87% rename from arm9/lib/libc/Makefile rename to arm9/lib/MSL_C/Makefile index 08fa004dd..67aa2af52 100644 --- a/arm9/lib/libc/Makefile +++ b/arm9/lib/MSL_C/Makefile @@ -54,7 +54,7 @@ OBJCOPY := $(CROSS)objcopy # ./tools/mwccarm/2.0/base/mwasmarm.exe -proc arm5te asm/arm9_thumb.s -o arm9.o MWASFLAGS = -proc arm5te -ir ../../.. -MWCFLAGS = O4,p -gccext,on -proc arm946e -msgstyle gcc -gccinc -fp soft -lang c99 -Cpp_exceptions off -i ../include -ir ../include-mw -ir lib/libc/include -ir lib/libnns/include -ir lib/NitroSDK/include -interworking -DFS_IMPLEMENT -enum int -D$(GAME_VERSION) -D$(GAME_LANGUAGE) -W all -W pedantic -W noimpl_signedunsigned -W noimplicitconv -W nounusedarg -W nomissingreturn -W error -ipa file +MWCFLAGS = O4,p -gccext,on -proc arm946e -msgstyle gcc -gccinc -fp soft -lang c99 -Cpp_exceptions off -i ../include -ir ../include-mw -ir lib/MSL_C/include -ir lib/libnns/include -ir lib/NitroSDK/include -interworking -DFS_IMPLEMENT -enum int -D$(GAME_VERSION) -D$(GAME_LANGUAGE) -W all -W pedantic -W noimpl_signedunsigned -W noimplicitconv -W nounusedarg -W nomissingreturn -W error -ipa file MWLDFLAGS = -library -nodead -w off -proc v5te -interworking -pic ARFLAGS = rcS diff --git a/arm9/lib/libc/include/MSL.h b/arm9/lib/MSL_C/include/MSL.h similarity index 100% rename from arm9/lib/libc/include/MSL.h rename to arm9/lib/MSL_C/include/MSL.h diff --git a/arm9/lib/libc/include/MSL_Common_arith.h b/arm9/lib/MSL_C/include/MSL_Common_arith.h similarity index 100% rename from arm9/lib/libc/include/MSL_Common_arith.h rename to arm9/lib/MSL_C/include/MSL_Common_arith.h diff --git a/arm9/lib/libc/include/MSL_Common_rand.h b/arm9/lib/MSL_C/include/MSL_Common_rand.h similarity index 100% rename from arm9/lib/libc/include/MSL_Common_rand.h rename to arm9/lib/MSL_C/include/MSL_Common_rand.h diff --git a/arm9/lib/libc/include/ansi_params.h b/arm9/lib/MSL_C/include/ansi_params.h similarity index 100% rename from arm9/lib/libc/include/ansi_params.h rename to arm9/lib/MSL_C/include/ansi_params.h diff --git a/arm9/lib/libc/include/size_t.h b/arm9/lib/MSL_C/include/size_t.h similarity index 100% rename from arm9/lib/libc/include/size_t.h rename to arm9/lib/MSL_C/include/size_t.h diff --git a/arm9/lib/libc/include/string.h b/arm9/lib/MSL_C/include/string.h similarity index 100% rename from arm9/lib/libc/include/string.h rename to arm9/lib/MSL_C/include/string.h diff --git a/arm9/lib/libc/src/MSL_Common_arith.c b/arm9/lib/MSL_C/src/MSL_Common_arith.c similarity index 100% rename from arm9/lib/libc/src/MSL_Common_arith.c rename to arm9/lib/MSL_C/src/MSL_Common_arith.c diff --git a/arm9/lib/libc/src/MSL_Common_rand.c b/arm9/lib/MSL_C/src/MSL_Common_rand.c similarity index 100% rename from arm9/lib/libc/src/MSL_Common_rand.c rename to arm9/lib/MSL_C/src/MSL_Common_rand.c diff --git a/arm9/lib/Makefile b/arm9/lib/Makefile index 8ece4def8..496b3fee1 100644 --- a/arm9/lib/Makefile +++ b/arm9/lib/Makefile @@ -54,11 +54,11 @@ OBJCOPY := $(CROSS)objcopy # ./tools/mwccarm/2.0/base/mwasmarm.exe -proc arm5te asm/arm9_thumb.s -o arm9.o MWASFLAGS = -proc arm5te -ir ../.. -MWCFLAGS = -O4,p -char signed -inline on,noauto -proc arm946e -msgstyle gcc -gccinc -fp soft -lang c99 -Cpp_exceptions off -i include -ir include-mw -ir arm9/lib/libc/include -ir arm9/lib/libnns/include -ir arm9/lib/NitroSDK/include -W all -W pedantic -W noimpl_signedunsigned -W noimplicitconv -W nounusedarg -W nomissingreturn -W error +MWCFLAGS = -O4,p -char signed -inline on,noauto -proc arm946e -msgstyle gcc -gccinc -fp soft -lang c99 -Cpp_exceptions off -i include -ir include-mw -ir arm9/lib/MSL_C/include -ir arm9/lib/libnns/include -ir arm9/lib/NitroSDK/include -W all -W pedantic -W noimpl_signedunsigned -W noimplicitconv -W nounusedarg -W nomissingreturn -W error MWLDFLAGS = -library -nodead -w off -proc v5te -interworking -pic -msgstyle gcc ARFLAGS = rcS -export MWCIncludes := libc/include libnns/include NitroSDK/include +export MWCIncludes := MSL_C/include libnns/include NitroSDK/include ################ Targets ################# @@ -69,12 +69,12 @@ all: libs $(LIBS) @: libs: - $(MAKE) -C libc + $(MAKE) -C MSL_C $(MAKE) -C libnns $(MAKE) -C NitroSDK clean: - $(MAKE) clean -C libc + $(MAKE) clean -C MSL_C $(MAKE) clean -C libnns $(MAKE) clean -C NitroSDK $(RM) $(LIBS) diff --git a/arm9/lib/NitroSDK/Makefile b/arm9/lib/NitroSDK/Makefile index 0d84879df..bf161bb82 100644 --- a/arm9/lib/NitroSDK/Makefile +++ b/arm9/lib/NitroSDK/Makefile @@ -54,7 +54,7 @@ OBJCOPY := $(CROSS)objcopy # ./tools/mwccarm/2.0/base/mwasmarm.exe -proc arm5te asm/arm9_thumb.s -o arm9.o MWASFLAGS = -proc arm5te -ir ../../.. -MWCFLAGS = -O4,p -gccext,on -proc arm946e -msgstyle gcc -gccinc -fp soft -lang c99 -Cpp_exceptions off -i ../include -ir ../include-mw -ir lib/libc/include -ir lib/libnns/include -ir lib/NitroSDK/include -interworking -DFS_IMPLEMENT -enum int -D$(GAME_VERSION) -D$(GAME_LANGUAGE) -W all -W pedantic -W noimpl_signedunsigned -W noimplicitconv -W nounusedarg -W nomissingreturn -W error +MWCFLAGS = -O4,p -gccext,on -proc arm946e -msgstyle gcc -gccinc -fp soft -lang c99 -Cpp_exceptions off -i ../include -ir ../include-mw -ir lib/MSL_C/include -ir lib/libnns/include -ir lib/NitroSDK/include -interworking -DFS_IMPLEMENT -enum int -D$(GAME_VERSION) -D$(GAME_LANGUAGE) -W all -W pedantic -W noimpl_signedunsigned -W noimplicitconv -W nounusedarg -W nomissingreturn -W error MWLDFLAGS = -library -nodead -w off -proc v5te -interworking -pic -msgstyle gcc ARFLAGS = rcS diff --git a/arm9/lib/libnns/Makefile b/arm9/lib/libnns/Makefile index 72d82b57b..46dd65581 100644 --- a/arm9/lib/libnns/Makefile +++ b/arm9/lib/libnns/Makefile @@ -55,7 +55,7 @@ OBJCOPY := $(CROSS)objcopy # ./tools/mwccarm/2.0/base/mwasmarm.exe -proc arm5te asm/arm9_thumb.s -o arm9.o MWASFLAGS = -proc arm5te -ir ../../.. -MWCFLAGS = -O4,p -gccext,on -proc arm946e -msgstyle gcc -gccinc -fp soft -lang c99 -Cpp_exceptions off -i ../include -ir ../include-mw -ir lib/libc/include -ir lib/libnns/include -ir lib/NitroSDK/include -interworking -DFS_IMPLEMENT -enum int -D$(GAME_VERSION) -D$(GAME_LANGUAGE) -W all -W pedantic -W noimpl_signedunsigned -W noimplicitconv -W nounusedarg -W nomissingreturn -W error +MWCFLAGS = -O4,p -gccext,on -proc arm946e -msgstyle gcc -gccinc -fp soft -lang c99 -Cpp_exceptions off -i ../include -ir ../include-mw -ir lib/MSL_C/include -ir lib/libnns/include -ir lib/NitroSDK/include -interworking -DFS_IMPLEMENT -enum int -D$(GAME_VERSION) -D$(GAME_LANGUAGE) -W all -W pedantic -W noimpl_signedunsigned -W noimplicitconv -W nounusedarg -W nomissingreturn -W error MWLDFLAGS = -library -nodead -w off -proc v5te -interworking -pic -msgstyle gcc ARFLAGS = rcS diff --git a/m2ctx.sh b/m2ctx.sh index 25fedb82f..99a4a99ec 100644 --- a/m2ctx.sh +++ b/m2ctx.sh @@ -4,7 +4,7 @@ OUT_FILE=ctx.c GCC=gcc FLAGS="-E -P -dD -undef" -INCLUDES="-Iinclude -Iinclude/constants -Iinclude/nitro -Iinclude-mw -Ifiles -Iarm9/lib/NitroSDK/include -Iarm9/lib/libc/include -Iarm9/lib/libnns/include -Iarm9/overlays/21/include -Iarm9/overlays/52/include -Iarm9/overlays/59/include -include global.h" +INCLUDES="-Iinclude -Iinclude/constants -Iinclude/nitro -Iinclude-mw -Ifiles -Iarm9/lib/NitroSDK/include -Iarm9/lib/MSL_C/include -Iarm9/lib/libnns/include -Iarm9/overlays/21/include -Iarm9/overlays/52/include -Iarm9/overlays/59/include -include global.h" DEFINES="-DDIAMOND"