External/pspsdk
1
0
Fork 0
mirror of https://github.com/pspdev/pspsdk.git synced 2025-10-04 17:09:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improve base makefiles to be used with the new POSIX and standard environment

Browse Source
This commit is contained in:
Francisco Javier Trujillo Mata
2021-11-13 16:40:26 +01:00
parent cee267dcb7
commit 514f7947d7
2 changed files with 20 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
src/base/build.mak
View File

@@ -26,11 +26,11 @@ PACK_PBP = pack-pbp
FIXUP = psp-fixup-imports FIXUP = psp-fixup-imports
ENC = PrxEncrypter ENC = PrxEncrypter
# Add in PSPSDK includes and libraries. # Add PSPSDK includes and libraries.
INCDIR := $(INCDIR) . $(PSPSDK)/include INCDIR := $(INCDIR) . $(PSPDEV)/psp/include $(PSPSDK)/include
LIBDIR := $(LIBDIR) . $(PSPSDK)/lib LIBDIR := $(LIBDIR) . $(PSPDEV)/psp/lib $(PSPSDK)/lib
CFLAGS := $(addprefix -I,$(INCDIR)) $(CFLAGS) CFLAGS := $(addprefix -I,$(INCDIR)) -G0 $(CFLAGS)
CXXFLAGS := $(CFLAGS) $(CXXFLAGS) CXXFLAGS := $(CFLAGS) $(CXXFLAGS)
ASFLAGS := $(CFLAGS) $(ASFLAGS) ASFLAGS := $(CFLAGS) $(ASFLAGS)
@@ -59,43 +59,14 @@ else
LDFLAGS := $(addprefix -L,$(LIBDIR)) $(LDFLAGS) LDFLAGS := $(addprefix -L,$(LIBDIR)) $(LDFLAGS)
endif endif
# Library selection. By default we link with Newlib's libc. Allow the # Reduce binary size
# user to link with PSPSDK's libc if USE_PSPSDK_LIBC is set to 1. LDFLAGS += -Wl,-zmax-page-size=128
ifeq ($(USE_KERNEL_LIBC),1)
# Use the PSP's kernel libc
PSPSDK_LIBC_LIB =
CFLAGS := -I$(PSPSDK)/include/libc $(CFLAGS)
else
ifeq ($(USE_PSPSDK_LIBC),1)
# Use the pspsdk libc
PSPSDK_LIBC_LIB = -lpsplibc
CFLAGS := -I$(PSPSDK)/include/libc $(CFLAGS)
else
# Use newlib (urgh)
PSPSDK_LIBC_LIB = -lc
endif
endif
# Link with following default libraries. Other libraries should be specified in the $(LIBS) variable.
# TODO: This library list needs to be generated at configure time.
#
ifeq ($(USE_KERNEL_LIBS),1) ifeq ($(USE_KERNEL_LIBS),1)
PSPSDK_LIBS = -lpspdebug -lpspdisplay_driver -lpspctrl_driver -lpspsdk LIBS := -nostdlib $(LIBS) -lpspdebug -lpspdisplay_driver -lpspctrl_driver -lpspsdk -lpspkernel
LIBS := $(LIBS) $(PSPSDK_LIBS) $(PSPSDK_LIBC_LIB) -lpspkernel
else else
ifeq ($(USE_USER_LIBS),1) LIBS := $(LIBS) -lpspdebug -lpspdisplay -lpspge -lpspctrl -lpspsdk \
PSPSDK_LIBS = -lpspdebug -lpspdisplay -lpspge -lpspctrl -lpspsdk -lpspnet -lpspnet_apctl
LIBS := $(LIBS) $(PSPSDK_LIBS) $(PSPSDK_LIBC_LIB) -lpspnet \
-lpspnet_inet -lpspnet_apctl -lpspnet_resolver -lpsputility \
-lpspuser
else
PSPSDK_LIBS = -lpspdebug -lpspdisplay -lpspge -lpspctrl -lpspsdk
LIBS := $(LIBS) $(PSPSDK_LIBS) $(PSPSDK_LIBC_LIB) -lpspnet \
-lpspnet_inet -lpspnet_apctl -lpspnet_resolver -lpsputility \
-lpspuser -lpspkernel
endif
endif endif
# Define the overridable parameters for EBOOT.PBP # Define the overridable parameters for EBOOT.PBP

45
src/base/build_prx.mak
View File

@@ -20,15 +20,21 @@ AS = psp-gcc
LD = psp-gcc LD = psp-gcc
FIXUP = psp-fixup-imports FIXUP = psp-fixup-imports
# Add in PSPSDK includes and libraries. # Add PSPSDK includes and libraries.
INCDIR := $(INCDIR) . $(PSPSDK)/include INCDIR := $(INCDIR) . $(PSPDEV)/psp/include $(PSPSDK)/include
LIBDIR := $(LIBDIR) . $(PSPSDK)/lib LIBDIR := $(LIBDIR) . $(PSPDEV)/psp/lib $(PSPSDK)/lib
CFLAGS := $(addprefix -I,$(INCDIR)) $(CFLAGS) CFLAGS := $(addprefix -I,$(INCDIR)) -G0 $(CFLAGS)
CXXFLAGS := $(CFLAGS) $(CXXFLAGS) CXXFLAGS := $(CFLAGS) $(CXXFLAGS)
ASFLAGS := $(CFLAGS) $(ASFLAGS) ASFLAGS := $(CFLAGS) $(ASFLAGS)
LDFLAGS := $(addprefix -L,$(LIBDIR)) -Wl,-q,-T$(PSPSDK)/lib/linkfile.prx -nostartfiles $(LDFLAGS) 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
else
LIBS := $(LIBS) -lpspdebug -lpspdisplay -lpspge -lpspctrl -lpspsdk
endif
ifeq ($(PSP_FW_VERSION),) ifeq ($(PSP_FW_VERSION),)
PSP_FW_VERSION=150 PSP_FW_VERSION=150
@@ -36,35 +42,6 @@ endif
CFLAGS += -D_PSP_FW_VERSION=$(PSP_FW_VERSION) CFLAGS += -D_PSP_FW_VERSION=$(PSP_FW_VERSION)
# Library selection. By default we link with Newlib's libc. Allow the
# user to link with PSPSDK's libc if USE_PSPSDK_LIBC is set to 1.
ifeq ($(USE_KERNEL_LIBC),1)
# Use the PSP's kernel libc
PSPSDK_LIBC_LIB =
CFLAGS := -I$(PSPSDK)/include/libc $(CFLAGS)
else
ifeq ($(USE_PSPSDK_LIBC),1)
# Use the pspsdk libc
PSPSDK_LIBC_LIB = -lpsplibc
CFLAGS := -I$(PSPSDK)/include/libc $(CFLAGS)
else
# Use newlib (urgh)
PSPSDK_LIBC_LIB = -lc
endif
endif
# Link with following default libraries. Other libraries should be specified in the $(LIBS) variable.
# TODO: This library list needs to be generated at configure time.
ifeq ($(USE_KERNEL_LIBS),1)
PSPSDK_LIBS = -lpspdebug -lpspdisplay_driver -lpspctrl_driver -lpspsdk
LIBS := $(LIBS) $(PSPSDK_LIBS) $(PSPSDK_LIBC_LIB) -lpspkernel
else
PSPSDK_LIBS = -lpspdebug -lpspdisplay -lpspge -lpspctrl -lpspsdk
LIBS := $(LIBS) $(PSPSDK_LIBS) $(PSPSDK_LIBC_LIB) -lpsputility -lpspuser -lpspkernel
endif
FINAL_TARGET = $(TARGET).prx FINAL_TARGET = $(TARGET).prx
all: $(FINAL_TARGET) all: $(FINAL_TARGET)