Skip to content

Commit

Permalink
Misc tweaks and fixes
Browse files Browse the repository at this point in the history
* Imagine: Increase minimum compiler requirements to GCC 14 or Clang 18
* Imagine: Use C++23 "Deducing this" feature added in above compiler versions to remove various duplicated member functions and simplify CRTP use
* Imagine: Fix display of single item TableView selected rectangle
* Imagine: Rename ctype utility functions to avoid possible collisions with macros in ctype.h
* Imagine: Fix Clang compilation on desktop linux and use libc++ by default
* Imagine: Various fixes for the OpenPandora handheld build
* Imagine: Update bundled libpng to 1.6.43 and drop support for old versions
* Imagine: Set -march=x86-64-v3 compile flag as default for Linux x86-64 build
* Imagine: Remove bundled Tremor library and use libvorbis for all ARMv7 builds
* C64.emu: Update gtk3_sym.vkm assets
  • Loading branch information
Robert Broglia committed Apr 25, 2024
1 parent 42bf495 commit ff8573d
Show file tree
Hide file tree
Showing 241 changed files with 1,640 additions and 17,669 deletions.
2 changes: 1 addition & 1 deletion 2600.emu/metadata/conf.mk
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ metadata_pkgName = 2600Emu
metadata_supportedFileExtensions += a26
metadata_id = com.explusalpha.A2600Emu
metadata_vendor = Robert Broglia
pnd_metadata_description = Atari 2600 emulator using components from Stella 4.7.3
pnd_metadata_description = Atari 2600 emulator using components from Stella
1 change: 1 addition & 0 deletions 2600.emu/res/pandora/gpOverlay.png
15 changes: 7 additions & 8 deletions 2600.emu/src/main/EmuMenuViews.cc
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,11 @@ namespace EmuEx

constexpr SystemLogger log{"2600.emu"};

template <class T>
using MainAppHelper = EmuAppHelper<T, MainApp>;
using MainAppHelper = EmuAppHelperBase<MainApp>;

class CustomAudioOptionView : public AudioOptionView, public MainAppHelper<CustomAudioOptionView>
class CustomAudioOptionView : public AudioOptionView, public MainAppHelper
{
using MainAppHelper<CustomAudioOptionView>::system;
using MainAppHelper::system;

TextMenuItem::SelectDelegate setResampleQualityDel()
{
Expand Down Expand Up @@ -71,9 +70,9 @@ class CustomAudioOptionView : public AudioOptionView, public MainAppHelper<Custo
}
};

class CustomVideoOptionView : public VideoOptionView, public MainAppHelper<CustomVideoOptionView>
class CustomVideoOptionView : public VideoOptionView, public MainAppHelper
{
using MainAppHelper<CustomVideoOptionView>::system;
using MainAppHelper::system;

TextMenuItem tvPhosphorBlendItem[4]
{
Expand Down Expand Up @@ -108,7 +107,7 @@ class CustomVideoOptionView : public VideoOptionView, public MainAppHelper<Custo
}
};

class ConsoleOptionView : public TableView, public MainAppHelper<ConsoleOptionView>
class ConsoleOptionView : public TableView, public MainAppHelper
{
TextMenuItem tvPhosphorItem[3]
{
Expand Down Expand Up @@ -320,7 +319,7 @@ class ConsoleOptionView : public TableView, public MainAppHelper<ConsoleOptionVi
{}
};

class VCSSwitchesView : public TableView, public MainAppHelper<VCSSwitchesView>
class VCSSwitchesView : public TableView, public MainAppHelper
{
BoolMenuItem diff1
{
Expand Down
5 changes: 5 additions & 0 deletions C64.emu/build.mk
Original file line number Diff line number Diff line change
Expand Up @@ -631,7 +631,12 @@ libtapeport_a_SOURCES := $(subst $(viceSrcPath)/,,$(filter %.c, $(wildcard $(vic

libsamplerdrv_a_SOURCES := $(subst $(viceSrcPath)/,,$(filter %.c, $(wildcard $(viceSrcPath)/samplerdrv/*)))

ifeq ($(SUBENV), pandora)
libcCompatSrc = main/linuxCompat.c
endif

pluginNoTape_src = \
$(libcCompatSrc) \
main/pluginCommon.c \
main/pluginCxxSupport.cc \
$(libsounddrv_a_SOURCES) \
Expand Down
2 changes: 1 addition & 1 deletion C64.emu/metadata/conf.mk
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ metadata_pkgName = C64Emu
metadata_supportedFileExtensions += d64 g64 p64 x64 t64 tap crt
metadata_id = com.explusalpha.C64Emu
metadata_vendor = Robert Broglia
pnd_metadata_description = Commodore 64 emulator using components from VICE 3.1
pnd_metadata_description = Commodore 64 emulator using components from VICE
1 change: 1 addition & 0 deletions C64.emu/res/pandora/gpOverlay.png
Loading

0 comments on commit ff8573d

Please sign in to comment.