From e66eddd9b34b5a3c8778c24d97461e431572dbb4 Mon Sep 17 00:00:00 2001 From: Francisco Javier Trujillo Mata Date: Sat, 4 Dec 2021 14:17:55 +0100 Subject: [PATCH] Add pspsdk to the standard libs --- Dockerfile | 3 ++- src/base/build.mak | 4 ++-- src/base/build_prx.mak | 4 ++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index f56d109f..10873bd4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,13 +13,14 @@ RUN cd /src && \ make -j $(getconf _NPROCESSORS_ONLN) && \ make -j $(getconf _NPROCESSORS_ONLN) install -## gcc needs to include libcglue libpsputility libpsprtc libpspnet_inet libpspnet_resolver libpspuser libpspkernel +## gcc needs to include libcglue libpsputility libpsprtc libpspnet_inet libpspnet_resolver lpspsdk libpspuser libpspkernel ## from pspsdk to be able to build executables, because they are part of the standard libraries RUN ln -sf "$PSPDEV/psp/sdk/lib/libcglue.a" "$PSPDEV/psp/lib/libcglue.a" || { exit 1; } RUN ln -sf "$PSPDEV/psp/sdk/lib/libpsputility.a" "$PSPDEV/psp/lib/libpsputility.a" || { exit 1; } RUN ln -sf "$PSPDEV/psp/sdk/lib/libpsprtc.a" "$PSPDEV/psp/lib/libpsprtc.a" || { exit 1; } RUN ln -sf "$PSPDEV/psp/sdk/lib/libpspnet_inet.a" "$PSPDEV/psp/lib/libpspnet_inet.a" || { exit 1; } RUN ln -sf "$PSPDEV/psp/sdk/lib/libpspnet_resolver.a" "$PSPDEV/psp/lib/libpspnet_resolver.a" || { exit 1; } +RUN ln -sf "$PSPDEV/psp/sdk/lib/libpspsdk.a" "$PSPDEV/psp/lib/libpspsdk.a" || { exit 1; } RUN ln -sf "$PSPDEV/psp/sdk/lib/libpspuser.a" "$PSPDEV/psp/lib/libpspuser.a" || { exit 1; } RUN ln -sf "$PSPDEV/psp/sdk/lib/libpspkernel.a" "$PSPDEV/psp/lib/libpspkernel.a" || { exit 1; } diff --git a/src/base/build.mak b/src/base/build.mak index 3f819559..f4015603 100644 --- a/src/base/build.mak +++ b/src/base/build.mak @@ -63,9 +63,9 @@ endif LDFLAGS += -Wl,-zmax-page-size=128 ifeq ($(USE_KERNEL_LIBS),1) -LIBS := -nostdlib $(LIBS) -lpspdebug -lpspdisplay_driver -lpspctrl_driver -lpspsdk -lpspkernel +LIBS := -nostdlib $(LIBS) -lpspdebug -lpspdisplay_driver -lpspctrl_driver -lpspkernel else -LIBS := $(LIBS) -lpspdebug -lpspdisplay -lpspge -lpspctrl -lpspsdk \ +LIBS := $(LIBS) -lpspdebug -lpspdisplay -lpspge -lpspctrl \ -lpspnet -lpspnet_apctl endif diff --git a/src/base/build_prx.mak b/src/base/build_prx.mak index 0526984d..05ed7a59 100644 --- a/src/base/build_prx.mak +++ b/src/base/build_prx.mak @@ -31,9 +31,9 @@ ASFLAGS := $(CFLAGS) $(ASFLAGS) LDFLAGS := $(addprefix -L,$(LIBDIR)) -Wl,-q,-T$(PSPSDK)/lib/linkfile.prx -nostartfiles -Wl,-zmax-page-size=128 $(LDFLAGS) ifeq ($(USE_KERNEL_LIBS),1) -LIBS := -nostdlib $(LIBS) -lpspdebug -lpspdisplay_driver -lpspctrl_driver -lpspsdk -lpspkernel +LIBS := -nostdlib $(LIBS) -lpspdebug -lpspdisplay_driver -lpspctrl_driver -lpspkernel else -LIBS := $(LIBS) -lpspdebug -lpspdisplay -lpspge -lpspctrl -lpspsdk +LIBS := $(LIBS) -lpspdebug -lpspdisplay -lpspge -lpspctrl endif ifeq ($(PSP_FW_VERSION),)