From 2397b4c0f50f28b54f73815ce989eb4fa72e88df Mon Sep 17 00:00:00 2001 From: Christian Speckner Date: Tue, 30 Nov 2021 21:31:23 +0000 Subject: [PATCH 1/6] Fix PGO on gcc 10. --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 205af0579..b96fe15a8 100644 --- a/Makefile +++ b/Makefile @@ -145,8 +145,8 @@ ifdef HAVE_GCC CFLAGS_PROFILE_USE += -fprofile-use -fprofile-dir=$(PROFILE_OUT) LDFLAGS_PROFILE_GENERATE += -fprofile-generate STELLA_PROFILE_GENERATE := $(STELLA_PROFILE_GENERATE) && \ - rm -fr $(PROFILE_OUT)/$(OBJECT_ROOT_PROFILE_USE) && \ - mv $(PROFILE_OUT)/$(OBJECT_ROOT_PROFILE_GENERERATE) $(PROFILE_OUT)/$(OBJECT_ROOT_PROFILE_USE) + (rm -fr $(PROFILE_OUT)/$(OBJECT_ROOT_PROFILE_USE) || true) && \ + (mv $(PROFILE_OUT)/$(OBJECT_ROOT_PROFILE_GENERERATE) $(PROFILE_OUT)/$(OBJECT_ROOT_PROFILE_USE) || true) endif all: $(EXECUTABLE) From 390c69fb36393a9473a20b78ef6476ab67720353 Mon Sep 17 00:00:00 2001 From: Christian Speckner Date: Tue, 30 Nov 2021 21:31:41 +0000 Subject: [PATCH 2/6] Fix build on gcc 10. --- src/emucore/OSystemStandalone.cxx | 5 +++++ src/emucore/OSystemStandalone.hxx | 3 +++ 2 files changed, 8 insertions(+) diff --git a/src/emucore/OSystemStandalone.cxx b/src/emucore/OSystemStandalone.cxx index f7008edfe..e61f7278c 100644 --- a/src/emucore/OSystemStandalone.cxx +++ b/src/emucore/OSystemStandalone.cxx @@ -48,3 +48,8 @@ shared_ptr OSystemStandalone::getHighscoreRep { return shared_ptr(myStellaDb, &myStellaDb->highscoreRepository()); } + +// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +void OSystemStandalone::getBaseDirectories(string& basedir, string& homedir, + bool useappdir, const string& usedir) +{} diff --git a/src/emucore/OSystemStandalone.hxx b/src/emucore/OSystemStandalone.hxx index 34e0aaf42..6035cd912 100644 --- a/src/emucore/OSystemStandalone.hxx +++ b/src/emucore/OSystemStandalone.hxx @@ -40,6 +40,9 @@ class OSystemStandalone : public OSystem string describePresistence() override; + void getBaseDirectories(string& basedir, string& homedir, + bool useappdir, const string& usedir) override; + private: shared_ptr myStellaDb; From ae53d42c799d651ec05e71d8a91c573f7ba7d0d1 Mon Sep 17 00:00:00 2001 From: Thomas Jentzsch Date: Wed, 15 Dec 2021 12:26:00 +0100 Subject: [PATCH 3/6] trying to fix menu problems with analog controllers --- src/common/PJoystickHandler.cxx | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/common/PJoystickHandler.cxx b/src/common/PJoystickHandler.cxx index 250919b5e..3f4c214b1 100644 --- a/src/common/PJoystickHandler.cxx +++ b/src/common/PJoystickHandler.cxx @@ -838,11 +838,10 @@ void PhysicalJoystickHandler::handleRegularAxisEvent(const PhysicalJoystickPtr j // Now filter out consecutive, similar values // (only pass on the event if the state has changed) if(value != j->axisLastValue[axis]) - { myHandler.overlay().handleJoyAxisEvent(stick, JoyAxis(axis), convertAxisValue(value), button); - - } } + else + myHandler.overlay().handleJoyAxisEvent(stick, JoyAxis(axis), JoyDir::NONE, button); j->axisLastValue[axis] = value; } #endif From 449af1ed58f7419ed6cd391bc3720ab2b59f9e0f Mon Sep 17 00:00:00 2001 From: Christian Speckner Date: Wed, 15 Dec 2021 16:09:18 +0000 Subject: [PATCH 4/6] What's new for R77 --- src/gui/WhatsNewDialog.cxx | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/gui/WhatsNewDialog.cxx b/src/gui/WhatsNewDialog.cxx index 39a6daca8..c7209c698 100644 --- a/src/gui/WhatsNewDialog.cxx +++ b/src/gui/WhatsNewDialog.cxx @@ -62,6 +62,9 @@ WhatsNewDialog::WhatsNewDialog(OSystem& osystem, DialogContainer& parent, add(ypos, "fixed palette and TV effects saving"); } add(ypos, "added MovieCart support"); + add(ypos, "keep multiple dump files when dumping to SD"); + add(ypos, "removed deadzone from USB game controllers"); + add(ypos, "add opt-out for overclocking to the settings file") #else if(version < "6.5") { From a14fcb2e58f1f21d927a3595ca2be1d2da806f70 Mon Sep 17 00:00:00 2001 From: Christian Speckner Date: Wed, 15 Dec 2021 19:17:50 +0000 Subject: [PATCH 5/6] Typo. --- src/gui/WhatsNewDialog.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gui/WhatsNewDialog.cxx b/src/gui/WhatsNewDialog.cxx index c7209c698..f2796a809 100644 --- a/src/gui/WhatsNewDialog.cxx +++ b/src/gui/WhatsNewDialog.cxx @@ -64,7 +64,7 @@ WhatsNewDialog::WhatsNewDialog(OSystem& osystem, DialogContainer& parent, add(ypos, "added MovieCart support"); add(ypos, "keep multiple dump files when dumping to SD"); add(ypos, "removed deadzone from USB game controllers"); - add(ypos, "add opt-out for overclocking to the settings file") + add(ypos, "add opt-out for overclocking to the settings file"); #else if(version < "6.5") { From 8771b8a94047a39dddc07a962b86c5cfd49d485a Mon Sep 17 00:00:00 2001 From: Christian Speckner Date: Thu, 16 Dec 2021 20:26:15 +0000 Subject: [PATCH 6/6] Fix crash by shrinking "What's new?" --- src/gui/WhatsNewDialog.cxx | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/src/gui/WhatsNewDialog.cxx b/src/gui/WhatsNewDialog.cxx index f2796a809..5e9568fc9 100644 --- a/src/gui/WhatsNewDialog.cxx +++ b/src/gui/WhatsNewDialog.cxx @@ -47,20 +47,6 @@ WhatsNewDialog::WhatsNewDialog(OSystem& osystem, DialogContainer& parent, const string& version = instance().settings().getString("stella.version"); #ifdef RETRON77 - if(version < "6.5") - { - add(ypos, "increased sample size for CDFJ+"); - add(ypos, "fixed navigation bug in Video & Audio settings dialog"); - add(ypos, "fixed autofire bug for trackball controllers"); - add(ypos, "fixed paddle button bug for jittering controllers"); - add(ypos, "improved switching between joysticks and paddles"); - add(ypos, "improved memory usage in UI mode"); - add(ypos, "fixed broken Driving Controller support for Stelladaptor/2600-daptor devices"); - add(ypos, "fixed missing QuadTari option in UI"); - add(ypos, "improved analog input reading"); - add(ypos, "fixed QuadTari support for some controller types"); - add(ypos, "fixed palette and TV effects saving"); - } add(ypos, "added MovieCart support"); add(ypos, "keep multiple dump files when dumping to SD"); add(ypos, "removed deadzone from USB game controllers");