[Scummvm-git-logs] scummvm master -> c27199496c8408d76dbaed497ebe5d9f352b4339
lephilousophe
lephilousophe at users.noreply.github.com
Wed Oct 9 13:33:18 CEST 2019
This automated email contains information about 5 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
8db65d0b6c CONFIGURE: Add portlibs paths for GameCube and Wii
24e786d1f0 WII: Fix reset_cb prototype for newer versions of libogc
81b364fbb3 WII: Add time.h to forbidden symbols exceptions
be4dd18dbc PLUGINS: Implement NONE relocation for PPC
c27199496c WII: Destroy everything before exiting
Commit: 8db65d0b6ce1835f3c751311ea365c6fd1bf93cf
https://github.com/scummvm/scummvm/commit/8db65d0b6ce1835f3c751311ea365c6fd1bf93cf
Author: Le Philousophe (lephilousophe at users.noreply.github.com)
Date: 2019-10-09T13:33:11+02:00
Commit Message:
CONFIGURE: Add portlibs paths for GameCube and Wii
Libraries provided by DevkitPPC are stored in these directories and
should be added to search paths
Changed paths:
configure
diff --git a/configure b/configure
index 211e75e..401da53 100755
--- a/configure
+++ b/configure
@@ -2816,10 +2816,12 @@ case $_host_os in
append_var CXXFLAGS "-fmodulo-sched"
append_var CXXFLAGS "-fuse-cxa-atexit"
append_var CXXFLAGS "-I$DEVKITPRO/libogc/include"
+ append_var CXXFLAGS "-I$DEVKITPRO/portlibs/ppc/include"
# libogc is required to link the cc tests (includes _start())
append_var LDFLAGS "-mogc"
append_var LDFLAGS "-mcpu=750"
append_var LDFLAGS "-L$DEVKITPRO/libogc/lib/cube"
+ append_var LDFLAGS "-L$DEVKITPRO/portlibs/ppc/lib"
append_var LDFLAGS "-logc"
if test "$_dynamic_modules" = "yes" ; then
# retarded toolchain patch forces --gc-sections, overwrite it
@@ -3012,10 +3014,12 @@ case $_host_os in
append_var CXXFLAGS "-fmodulo-sched"
append_var CXXFLAGS "-fuse-cxa-atexit"
append_var CXXFLAGS "-I$DEVKITPRO/libogc/include"
+ append_var CXXFLAGS "-I$DEVKITPRO/portlibs/ppc/include"
# libogc is required to link the cc tests (includes _start())
append_var LDFLAGS "-mrvl"
append_var LDFLAGS "-mcpu=750"
append_var LDFLAGS "-L$DEVKITPRO/libogc/lib/wii"
+ append_var LDFLAGS "-L$DEVKITPRO/portlibs/ppc/lib"
append_var LDFLAGS "-logc"
if test "$_dynamic_modules" = "yes" ; then
# retarded toolchain patch forces --gc-sections, overwrite it
Commit: 24e786d1f099cc4cde439aba257ede4f7c815c50
https://github.com/scummvm/scummvm/commit/24e786d1f099cc4cde439aba257ede4f7c815c50
Author: Le Philousophe (lephilousophe at users.noreply.github.com)
Date: 2019-10-09T13:33:11+02:00
Commit Message:
WII: Fix reset_cb prototype for newer versions of libogc
Changed paths:
backends/platform/wii/main.cpp
diff --git a/backends/platform/wii/main.cpp b/backends/platform/wii/main.cpp
index 35d800a..d33e968 100644
--- a/backends/platform/wii/main.cpp
+++ b/backends/platform/wii/main.cpp
@@ -33,6 +33,7 @@
#include "backends/plugins/wii/wii-provider.h"
#include <ogc/machine/processor.h>
+#include <ogc/libversion.h>
#include <fat.h>
#ifndef GAMECUBE
#include <wiiuse/wpad.h>
@@ -52,7 +53,13 @@ extern "C" {
bool reset_btn_pressed = false;
bool power_btn_pressed = false;
+#if ((_V_MAJOR_ > 1) || \
+ (_V_MAJOR_ == 1 && _V_MINOR_ > 8 ) || \
+ (_V_MAJOR_ == 1 && _V_MINOR_ == 8 && _V_PATCH_ >= 18))
+void reset_cb(u32, void *) {
+#else
void reset_cb(void) {
+#endif
#ifdef DEBUG_WII_GDB
printf("attach gdb now\n");
_break();
Commit: 81b364fbb3b94b513c4250efaba1b29c7998ae21
https://github.com/scummvm/scummvm/commit/81b364fbb3b94b513c4250efaba1b29c7998ae21
Author: Le Philousophe (lephilousophe at users.noreply.github.com)
Date: 2019-10-09T13:33:11+02:00
Commit Message:
WII: Add time.h to forbidden symbols exceptions
As network.h includes time.h, we must add this exception. We can't
include network.h before scummsys.h as inclusion depends on definitions
located in config.h which is loaded by scummsys.h.
Changed paths:
backends/fs/wii/wii-fs-factory.cpp
diff --git a/backends/fs/wii/wii-fs-factory.cpp b/backends/fs/wii/wii-fs-factory.cpp
index f234c1e..ca4c3d3 100644
--- a/backends/fs/wii/wii-fs-factory.cpp
+++ b/backends/fs/wii/wii-fs-factory.cpp
@@ -24,6 +24,7 @@
#define FORBIDDEN_SYMBOL_EXCEPTION_printf
#define FORBIDDEN_SYMBOL_EXCEPTION_getcwd
+#define FORBIDDEN_SYMBOL_EXCEPTION_time_h
#include <unistd.h>
Commit: be4dd18dbc070292c061791fe0581a978baf8162
https://github.com/scummvm/scummvm/commit/be4dd18dbc070292c061791fe0581a978baf8162
Author: Le Philousophe (lephilousophe at users.noreply.github.com)
Date: 2019-10-09T13:33:11+02:00
Commit Message:
PLUGINS: Implement NONE relocation for PPC
It's used by recent versions of GCC in .eh_frame sections
Changed paths:
backends/plugins/elf/elf32.h
backends/plugins/elf/ppc-loader.cpp
diff --git a/backends/plugins/elf/elf32.h b/backends/plugins/elf/elf32.h
index 9f6f92f..aae92b1 100644
--- a/backends/plugins/elf/elf32.h
+++ b/backends/plugins/elf/elf32.h
@@ -236,6 +236,7 @@ typedef struct {
#define R_ARM_V4BX 40
// PPC relocation types
+#define R_PPC_NONE 0
#define R_PPC_ADDR32 1
#define R_PPC_ADDR16_LO 4
#define R_PPC_ADDR16_HI 5
diff --git a/backends/plugins/elf/ppc-loader.cpp b/backends/plugins/elf/ppc-loader.cpp
index dffd959..8315a6a 100644
--- a/backends/plugins/elf/ppc-loader.cpp
+++ b/backends/plugins/elf/ppc-loader.cpp
@@ -61,6 +61,9 @@ bool PPCDLObject::relocate(Elf32_Off offset, Elf32_Word size, byte *relSegment)
//debug(8, "elfloader: i=%05d %p +0x%04x: (0x%08x) 0x%08x ", i, src, rel[i].r_addend, sym->st_value, *src);
switch (REL_TYPE(rel[i].r_info)) {
+ case R_PPC_NONE:
+ debug(8, "elfloader: R_PPC_NONE");
+ break;
case R_PPC_ADDR32:
*src = value;
debug(8, "elfloader: R_PPC_ADDR32 -> 0x%08x", *src);
Commit: c27199496c8408d76dbaed497ebe5d9f352b4339
https://github.com/scummvm/scummvm/commit/c27199496c8408d76dbaed497ebe5d9f352b4339
Author: Le Philousophe (lephilousophe at users.noreply.github.com)
Date: 2019-10-09T13:33:11+02:00
Commit Message:
WII: Destroy everything before exiting
That let's close virtual keyboard file.
Changed paths:
backends/platform/wii/main.cpp
backends/platform/wii/osystem.cpp
diff --git a/backends/platform/wii/main.cpp b/backends/platform/wii/main.cpp
index d33e968..e5d3e74 100644
--- a/backends/platform/wii/main.cpp
+++ b/backends/platform/wii/main.cpp
@@ -230,6 +230,9 @@ int main(int argc, char *argv[]) {
res = scummvm_main(argc, argv);
g_system->quit();
+ g_system->destroy();
+ g_system = nullptr;
+
printf("shutdown\n");
SYS_UnregisterResetFunc(&resetinfo);
diff --git a/backends/platform/wii/osystem.cpp b/backends/platform/wii/osystem.cpp
index c2751f6..54427bd 100644
--- a/backends/platform/wii/osystem.cpp
+++ b/backends/platform/wii/osystem.cpp
@@ -145,7 +145,16 @@ void OSystem_Wii::initBackend() {
}
void OSystem_Wii::quit() {
+ /* Delete _timerManager before deinitializing events as it's tied */
+ delete _timerManager;
+ _timerManager = nullptr;
+
deinitEvents();
+
+ /* Delete _eventManager before destroying FS to avoid problems when releasing virtual keyboard data */
+ delete _eventManager;
+ _eventManager = nullptr;
+
deinitSfx();
deinitGfx();
More information about the Scummvm-git-logs
mailing list