From f3122a07ce303c086bf3207f95ae6b9db0ab2fbe Mon Sep 17 00:00:00 2001 From: jaby Date: Sun, 4 Dec 2022 04:09:02 +0100 Subject: [PATCH] Remove pscx-redux dependency --- lib/Makefile | 2 +- lib/pcsx-redux/default.ld | 1 - lib/{pcsx-redux/ps-exe.ld => psexe.ld} | 0 template/JabyEngine-PSX_Game/application/Makefile | 1 - 4 files changed, 1 insertion(+), 3 deletions(-) delete mode 100644 lib/pcsx-redux/default.ld rename lib/{pcsx-redux/ps-exe.ld => psexe.ld} (100%) diff --git a/lib/Makefile b/lib/Makefile index 2729db24..36c4111a 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -62,7 +62,7 @@ CCFLAGS += -DJABYENGINE_$(TV_FORMAT) #Linker flags LDFLAGS_release += -Os -LDFLAGS_all += -Wl,-Map=$(TARGET).map -nostdlib -T$(PSCX_REDUX_DIR)/ps-exe.ld -T$(AUTO_OVERLAY_DIR)/Overlays.ld -static -Wl,--gc-sections -Wl,--build-id=none +LDFLAGS_all += -Wl,-Map=$(TARGET).map -nostdlib -T$(JABY_ENGINE_DIR)/lib/psexe.ld -T$(AUTO_OVERLAY_DIR)/Overlays.ld -static -Wl,--gc-sections -Wl,--build-id=none LDFLAGS_all += $(ARCHFLAGS) -Wl,--oformat=$(FORMAT) LDFLAGS_all += $(LDFLAGS_$(BUILD_PROFILE)) diff --git a/lib/pcsx-redux/default.ld b/lib/pcsx-redux/default.ld deleted file mode 100644 index d200a6d1..00000000 --- a/lib/pcsx-redux/default.ld +++ /dev/null @@ -1 +0,0 @@ -__heap_base = __bss_end; \ No newline at end of file diff --git a/lib/pcsx-redux/ps-exe.ld b/lib/psexe.ld similarity index 100% rename from lib/pcsx-redux/ps-exe.ld rename to lib/psexe.ld diff --git a/template/JabyEngine-PSX_Game/application/Makefile b/template/JabyEngine-PSX_Game/application/Makefile index 92096c34..e05edbb7 100644 --- a/template/JabyEngine-PSX_Game/application/Makefile +++ b/template/JabyEngine-PSX_Game/application/Makefile @@ -1,6 +1,5 @@ ARTIFACT = #{ProjectName} BUILD_DIR = bin -PSCX_REDUX_DIR = $(JABY_ENGINE_DIR)/lib/pcsx-redux include $(JABY_ENGINE_DIR)/lib/Wildcard.mk SRCS = $(call rwildcard, src, c cpp)