ShuriZma
/
stella
mirror of https://github.com/stella-emu/stella.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/6.6-r77'

This commit is contained in:
Christian Speckner 2022-05-24 21:55:13 +00:00
parent 78cc21824e 8771b8a940
commit d49b2b3818
4 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -146,8 +146,8 @@ ifdef HAVE_GCC
CFLAGS_PROFILE_USE += -fprofile-use -fprofile-dir=$(PROFILE_OUT) CFLAGS_PROFILE_USE += -fprofile-use -fprofile-dir=$(PROFILE_OUT)
LDFLAGS_PROFILE_GENERATE += -fprofile-generate LDFLAGS_PROFILE_GENERATE += -fprofile-generate
STELLA_PROFILE_GENERATE := $(STELLA_PROFILE_GENERATE) && \ STELLA_PROFILE_GENERATE := $(STELLA_PROFILE_GENERATE) && \
rm -fr $(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) (mv $(PROFILE_OUT)/$(OBJECT_ROOT_PROFILE_GENERERATE) $(PROFILE_OUT)/$(OBJECT_ROOT_PROFILE_USE) || true)
endif endif
all: $(EXECUTABLE) all: $(EXECUTABLE)

5
src/emucore/OSystemStandalone.cxx
View File

@ -48,3 +48,8 @@ shared_ptr<CompositeKeyValueRepositoryAtomic> OSystemStandalone::getHighscoreRep
{ {
return shared_ptr<CompositeKeyValueRepositoryAtomic>(myStellaDb, &myStellaDb->highscoreRepository()); return shared_ptr<CompositeKeyValueRepositoryAtomic>(myStellaDb, &myStellaDb->highscoreRepository());
} }
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
void OSystemStandalone::getBaseDirectories(string& basedir, string& homedir,
bool useappdir, const string& usedir)
{}

3
src/emucore/OSystemStandalone.hxx
View File

@ -40,6 +40,9 @@ class OSystemStandalone : public OSystem
string describePresistence() override; string describePresistence() override;
void getBaseDirectories(string& basedir, string& homedir,
bool useappdir, const string& usedir) override;
private: private:
shared_ptr<StellaDb> myStellaDb; shared_ptr<StellaDb> myStellaDb;

5
src/gui/WhatsNewDialog.cxx
View File

@ -60,7 +60,10 @@ WhatsNewDialog::WhatsNewDialog(OSystem& osystem, DialogContainer& parent,
add(ypos, "improved controller mappings for Paddles"); add(ypos, "improved controller mappings for Paddles");
add(ypos, "improved controller mappings for Driving controllers"); add(ypos, "improved controller mappings for Driving controllers");
add(ypos, "enhanced support for CDFJ+ bankswitching type"); add(ypos, "enhanced support for CDFJ+ bankswitching type");
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 #else
if(version < "6.6") if(version < "6.6")
{ {