[Scummvm-git-logs] scummvm master -> df48fa786197711ce458680c2c6905bb847dff2c
rsn8887
noreply at scummvm.org
Mon May 2 22:11:16 UTC 2022
This automated email contains information about 4 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
652846cac0 PSP: Remove standard libraries
1202099d61 PSP: Remove legacy PSP_HEAP_SIZE_KB macro
9aa4485137 PSP: Update executable start position
df48fa7861 PSP: Remove legacy Makefile
Commit: 652846cac0aafa05bfe03956098a9813bec07b6a
https://github.com/scummvm/scummvm/commit/652846cac0aafa05bfe03956098a9813bec07b6a
Author: Francisco Javier Trujillo Mata (fjtrujy at gmail.com)
Date: 2022-05-02T17:11:10-05:00
Commit Message:
PSP: Remove standard libraries
Changed paths:
backends/platform/psp/Makefile
backends/platform/psp/psp.spec
configure
diff --git a/backends/platform/psp/Makefile b/backends/platform/psp/Makefile
index 1b9932113e3..e28f87b2056 100644
--- a/backends/platform/psp/Makefile
+++ b/backends/platform/psp/Makefile
@@ -121,13 +121,12 @@ LDFLAGS += -pg
endif
# PSP LIBS
-PSPLIBS = -lpspprof -lpspvfpu -lpspdebug -lpspgu -lpspge -lpspdisplay -lpspctrl -lpspsdk \
- -lpsputility -lpspuser -lpsppower -lpsphprm -lpspsdk -lpsprtc -lpspaudio -lpspaudiocodec \
- -lpspkernel -lpspnet_inet
+PSPLIBS = -lpspprof -lpspvfpu -lpspdebug -lpspgu -lpspge -lpspdisplay \
+ -lpsppower -lpsphprm -lpspaudio -lpspaudiocodec
# Add in PSPSDK includes and libraries.
-LIBS += -lpng -lz -lstdc++ -lc -lm $(PSPLIBS)
+LIBS += -lpng -lz -lstdc++ $(PSPLIBS)
OBJS := powerman.o \
psp_main.o \
diff --git a/backends/platform/psp/psp.spec b/backends/platform/psp/psp.spec
index df28842bb72..569c3255879 100644
--- a/backends/platform/psp/psp.spec
+++ b/backends/platform/psp/psp.spec
@@ -1,3 +1,3 @@
%rename lib old_lib
*lib:
--lz -lstdc++ --start-group -lc %:if-exists(libpthreadglue.a%s) %:if-exists(libpthread.a%s) %:if-exists(libcglue.a%s) --end-group -lm -lpspprof -lpspvfpu -lpspdebug -lpspgu -lpspge -lpspdisplay -lpspctrl -lpspsdk -lpsputility -lpspuser -lpsppower -lpsphprm -lpsprtc -lpspaudio -lpspaudiocodec -lpspkernel -lpspnet_inet %(old_lib)
+-lstdc++ -lpspprof -lpspvfpu -lpspdebug -lpspgu -lpspge -lpspdisplay -lpspctrl -lpsppower -lpsphprm -lpspaudio -lpspaudiocodec %(old_lib)
diff --git a/configure b/configure
index 30f4995e37d..a012126de5a 100755
--- a/configure
+++ b/configure
@@ -4187,8 +4187,8 @@ POST_OBJS_FLAGS := -Wl,--export-all-symbols -Wl,--no-whole-archive -Wl,--out-im
_elf_loader=yes
append_var DEFINES "-DUNCACHED_PLUGINS"
_mak_plugins='
-LDFLAGS += -Wl,-T$(srcdir)/backends/plugins/psp/main_prog.ld
-PLUGIN_LDFLAGS += -Wl,-T$(srcdir)/backends/plugins/psp/plugin.ld -lstdc++ -lc
+LDFLAGS += -Wl,-T$(srcdir)/backends/plugins/psp/main_prog.ld -Wl,-zmax-page-size=128
+PLUGIN_LDFLAGS += -Wl,-T$(srcdir)/backends/plugins/psp/plugin.ld -Wl,-zmax-page-size=128 -lstdc++
'
;;
*)
Commit: 1202099d619b550a83230d75d78426136c87d8f1
https://github.com/scummvm/scummvm/commit/1202099d619b550a83230d75d78426136c87d8f1
Author: Francisco Javier Trujillo Mata (fjtrujy at gmail.com)
Date: 2022-05-02T17:11:10-05:00
Commit Message:
PSP: Remove legacy PSP_HEAP_SIZE_KB macro
Changed paths:
backends/platform/psp/psp_main.cpp
diff --git a/backends/platform/psp/psp_main.cpp b/backends/platform/psp/psp_main.cpp
index 1f257d36c2f..3f08099d714 100644
--- a/backends/platform/psp/psp_main.cpp
+++ b/backends/platform/psp/psp_main.cpp
@@ -79,7 +79,6 @@ PSP_MODULE_INFO("SCUMMVM-PSP", 0, 1, 1);
* even though the module was started in kernelmode
*/
PSP_MAIN_THREAD_ATTR(THREAD_ATTR_USER | THREAD_ATTR_VFPU);
-PSP_HEAP_SIZE_KB(-128); //Leave 128kb for thread stacks, etc.
#ifndef USERSPACE_ONLY
Commit: 9aa4485137bccb3ae3a0aa55e757154e7c6ba2df
https://github.com/scummvm/scummvm/commit/9aa4485137bccb3ae3a0aa55e757154e7c6ba2df
Author: Francisco Javier Trujillo Mata (fjtrujy at gmail.com)
Date: 2022-05-02T17:11:10-05:00
Commit Message:
PSP: Update executable start position
Changed paths:
backends/plugins/psp/main_prog.ld
diff --git a/backends/plugins/psp/main_prog.ld b/backends/plugins/psp/main_prog.ld
index 4216e7f0ab9..053bba4eede 100644
--- a/backends/plugins/psp/main_prog.ld
+++ b/backends/plugins/psp/main_prog.ld
@@ -7,7 +7,7 @@ ENTRY(_start)
SECTIONS
{
/* Read-only sections, merged into text segment: */
- PROVIDE (__executable_start = 0x08900000); . = 0x08900000;
+ PROVIDE (__executable_start = 0x08804000); . = 0x08804000;
.interp : { *(.interp) }
.reginfo : { *(.reginfo) }
.dynamic : { *(.dynamic) }
Commit: df48fa786197711ce458680c2c6905bb847dff2c
https://github.com/scummvm/scummvm/commit/df48fa786197711ce458680c2c6905bb847dff2c
Author: Francisco Javier Trujillo Mata (fjtrujy at gmail.com)
Date: 2022-05-02T17:11:10-05:00
Commit Message:
PSP: Remove legacy Makefile
Changed paths:
R backends/platform/psp/Makefile
diff --git a/backends/platform/psp/Makefile b/backends/platform/psp/Makefile
deleted file mode 100644
index e28f87b2056..00000000000
--- a/backends/platform/psp/Makefile
+++ /dev/null
@@ -1,201 +0,0 @@
-# SCUMMVM-PSP MakeFile
-
-
-#Use only this section to modify how the makefile behaves ------------
-
-# Scummvm engine config: choose which engines are enabled
-ENABLE_SCUMM = $(ENABLED)
-ENABLE_SCUMM_7_8 = $(ENABLED)
-ENABLE_HE = $(ENABLED)
-ENABLE_AGI = $(ENABLED)
-ENABLE_AGOS = $(ENABLED)
-ENABLE_AGOS2 = $(ENABLED)
-ENABLE_CINE = $(ENABLED)
-ENABLE_CRUISE = $(ENABLED)
-ENABLE_DRACI = $(ENABLED)
-ENABLE_DRASCULA = $(ENABLED)
-ENABLE_GOB = $(ENABLED)
-ENABLE_GROOVIE = $(ENABLED)
-ENABLE_GROOVIE2 = $(ENABLED)
-ENABLE_IHNM = $(ENABLED)
-ENABLE_KYRA = $(ENABLED)
-ENABLE_LOL = $(ENABLED)
-ENABLE_LURE = $(ENABLED)
-ENABLE_M4 = $(ENABLED)
-ENABLE_MADE = $(ENABLED)
-ENABLE_PARALLACTION = $(ENABLED)
-ENABLE_QUEEN = $(ENABLED)
-ENABLE_SAGA = $(ENABLED)
-ENABLE_SAGA2 = $(ENABLED)
-ENABLE_SCI = $(ENABLED)
-ENABLE_SCI32 = $(ENABLED)
-ENABLE_SKY = $(ENABLED)
-ENABLE_SWORD1 = $(ENABLED)
-ENABLE_SWORD2 = $(ENABLED)
-ENABLE_TEENAGENT = $(ENABLED)
-ENABLE_TINSEL = $(ENABLED)
-ENABLE_TOUCHE = $(ENABLED)
-ENABLE_TUCKER = $(ENABLED)
-
-# Set to 1 to enable seeing the commands to gcc
-VERBOSE_BUILD=1
-# Set to 1 to enable, 0 to disable dynamic modules
-DYNAMIC_MODULES = 1
-# Set to 1 to enable profiling
-ENABLE_PROFILING = 0
-# Set to 1 to enable, 0 to disable libmad and libogg
-USE_LIBMAD = 1
-USE_LIBOGG = 1
-# --------------------------------------------------------------------
-
-
-# General variables
-srcdir = ../../..
-VPATH = $(srcdir)
-TARGET = scummvm-psp
-# PSP SDK location variables
-PSPSDK := $(shell psp-config --pspsdk-path)
-PSPBIN = $(PSPSDK)/../bin
-
-#check PSPSDK presence
-ifeq ($(PSPSDK),)
-$(error $$(PSPSDK) cannot be obtained.)
-endif
-
-# Variables for common Scummvm makefile
-CXX = psp-g++
-CXXFLAGS = -O3 -Wall -Wno-multichar -fno-exceptions -fno-rtti
-DEFINES = -D__PSP__ -DNONSTANDARD_PORT -DDISABLE_TEXT_CONSOLE -DDISABLE_COMMAND_LINE -DUSE_ZLIB -DDISABLE_DOSBOX_OPL -DUSE_RGB_COLOR -DUSE_ELF_LOADER -DMIPS_TARGET
-
-LDFLAGS :=
-INCDIR := $(srcdir) . $(srcdir)/engines/ $(PSPSDK)/include
-INCLUDES := $(addprefix -I, $(INCDIR))
-DEPDIR = .deps
-MODULE_DIRS += ./
-MKDIR = mkdir -p
-RM = rm -f
-RM_REC = rm -rf
-AR = psp-ar cru
-RANLIB = psp-ranlib
-AS = psp-gcc
-LD = psp-gcc
-CXX_UPDATE_DEP_FLAG = -Wp,-MMD,"$(*D)/$(DEPDIR)/$(*F).d",-MQ,"$@",-MP
-
-# Variables for dynamic plugin building
-PLUGIN_PREFIX =
-PLUGIN_SUFFIX = .plg
-PLUGIN_EXTRA_DEPS = $(srcdir)/backends/plugins/elf/plugin.syms scummvm-psp.elf
-PLUGIN_LDFLAGS = -nostartfiles -Wl,-q,--just-symbols=scummvm-psp.org.elf,-T$(srcdir)/backends/plugins/psp/plugin.ld,--retain-symbols-file,$(srcdir)/backends/plugins/elf/plugin.syms -lstdc++ -lc
-
-# PSP-specific variables
-STRIP = psp-strip
-MKSFO = mksfoex -d MEMSIZE=1
-PACK_PBP = pack-pbp
-FIXUP = psp-fixup-imports
-
-# Test for adding different libs
-ifeq ($(USE_LIBMAD),1)
-DEFINES += -DUSE_MAD
-LIBS += -lmad
-endif
-ifeq ($(USE_LIBOGG), 1)
-DEFINES += -DUSE_VORBIS -DUSE_TREMOR
-LIBS += -lvorbisidec
-endif
-
-# Test for dynamic plugins
-ifeq ($(DYNAMIC_MODULES),1)
-ENABLED = DYNAMIC_PLUGIN
-DEFINES += -DDYNAMIC_MODULES
-PRE_OBJS_FLAGS = -Wl,--whole-archive
-POST_OBJS_FLAGS = -Wl,--no-whole-archive
-else
-ENABLED = STATIC_PLUGIN
-endif
-
-# Test for profiling
-ifeq ($(ENABLE_PROFILING),1)
-DEFINES += -DENABLE_PROFILING
-CXXFLAGS += -pg -g
-LDFLAGS += -pg
-endif
-
-# PSP LIBS
-PSPLIBS = -lpspprof -lpspvfpu -lpspdebug -lpspgu -lpspge -lpspdisplay \
- -lpsppower -lpsphprm -lpspaudio -lpspaudiocodec
-
-
-# Add in PSPSDK includes and libraries.
-LIBS += -lpng -lz -lstdc++ $(PSPLIBS)
-
-OBJS := powerman.o \
- psp_main.o \
- osys_psp.o \
- psppixelformat.o \
- memory.o \
- display_manager.o \
- display_client.o \
- default_display_client.o \
- input.o \
- cursor.o \
- trace.o \
- pspkeyboard.o \
- audio.o \
- thread.o \
- rtc.o \
- mp3.o \
- png_loader.o \
- image_viewer.o \
- tests.o \
- dummy.o
-
-
-BACKEND := psp
-
-# Include common Scummvm makefile
-include $(srcdir)/Makefile.common
-
-# Variables for PSP-specific rules
-PSP_EBOOT_SFO = param.sfo
-PSP_EBOOT_TITLE = ScummVM-PSP
-PSP_EBOOT = EBOOT.PBP
-PSP_EBOOT_ICON = icon0.png
-PSP_EBOOT_ICON1 = NULL
-PSP_EBOOT_PIC0 = pic0.png
-PSP_EBOOT_PIC1 = pic1.png
-PSP_EBOOT_SND0 = NULL
-PSP_EBOOT_PSAR = NULL
-
-LDFLAGS += -Wl,-T../../plugins/psp/main_prog.ld
-
-all: $(PSP_EBOOT)
-
-$(TARGET).elf: $(OBJS)
- +$(LD) $(PRE_OBJS_FLAGS) $(OBJS) $(POST_OBJS_FLAGS) $(LDFLAGS) $(LIBS) -o $@
- cp $(TARGET).elf $(TARGET).org.elf
- $(FIXUP) $@
-
-$(PSP_EBOOT_SFO):
- $(MKSFO) '$(PSP_EBOOT_TITLE)' $@
-
-$(PSP_EBOOT): $(TARGET).elf $(PSP_EBOOT_SFO)
- $(STRIP) $(TARGET).elf
- $(PACK_PBP) $@ $(PSP_EBOOT_SFO) $(PSP_EBOOT_ICON) $(PSP_EBOOT_ICON1) \
- $(PSP_EBOOT_PIC0) $(PSP_EBOOT_PIC1) $(PSP_EBOOT_SND0) \
- $(TARGET).elf $(PSP_EBOOT_PSAR)
-
-kxploit: $(TARGET).elf $(PSP_EBOOT_SFO)
- mkdir -p "$(TARGET)"
- $(STRIP) $(TARGET).elf -o $(TARGET)/$(PSP_EBOOT)
- mkdir -p "$(TARGET)%"
- $(PACK_PBP) "$(TARGET)%/$(PSP_EBOOT)" $(PSP_EBOOT_SFO) $(PSP_EBOOT_ICON) \
- $(PSP_EBOOT_ICON1) $(PSP_EBOOT_PIC0) $(PSP_EBOOT_PIC1) \
- $(PSP_EBOOT_SND0) NULL $(PSP_EBOOT_PSAR)
-
-SCEkxploit: $(TARGET).elf $(PSP_EBOOT_SFO)
- mkdir -p "__SCE__$(TARGET)"
- $(STRIP) $(TARGET).elf -o __SCE__$(TARGET)/$(PSP_EBOOT)
- mkdir -p "%__SCE__$(TARGET)"
- $(PACK_PBP) "%__SCE__$(TARGET)/$(PSP_EBOOT)" $(PSP_EBOOT_SFO) $(PSP_EBOOT_ICON) \
- $(PSP_EBOOT_ICON1) $(PSP_EBOOT_PIC0) $(PSP_EBOOT_PIC1) \
- $(PSP_EBOOT_SND0) NULL $(PSP_EBOOT_PSAR)
More information about the Scummvm-git-logs
mailing list