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

build: macOS C++ compatibility fixes 

Remove constexpr in user-input.h as LLVM 13 complains that it is
illegal.

Use variant-lite as nonstd::variant and related types as some variant
functions are macOS 10.14 Mojave only.

Signed-off-by: Rafael Kitover <rkitover@gmail.com>
This commit is contained in:
Rafael Kitover 2022-09-29 22:24:13 +00:00
parent 343eafc477
commit 85a95dcde0
No known key found for this signature in database
GPG Key ID: 08AB596679D86240
4 changed files with 42 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -456,8 +456,10 @@ add_definitions(-DPKGDATADIR="${CMAKE_INSTALL_FULL_DATADIR}/vbam" -DPACKAGE=)
add_definitions(-D__STDC_FORMAT_MACROS) add_definitions(-D__STDC_FORMAT_MACROS)
# For C++, default to nonstd::optional for now due to mac build issues # For C++, default to nonstd::optional and nonstd::variant for now due to mac
# build issues.
add_definitions(-Doptional_CONFIG_SELECT_OPTIONAL=optional_OPTIONAL_NONSTD) add_definitions(-Doptional_CONFIG_SELECT_OPTIONAL=optional_OPTIONAL_NONSTD)
add_definitions(-Dvariant_CONFIG_SELECT_VARIANT=variant_VARIANT_NONSTD)
if(ENABLE_LINK) if(ENABLE_LINK)
# IPC linking code needs sem_timedwait which can be either in librt or pthreads # IPC linking code needs sem_timedwait which can be either in librt or pthreads

6
src/wx/config/user-input.h
View File

@ -33,7 +33,7 @@ public:
bool is_config = false); bool is_config = false);
// Invalid UserInput, mainly used for comparison. // Invalid UserInput, mainly used for comparison.
constexpr UserInput() : UserInput(Device::Invalid, 0, 0, 0) {} UserInput() : UserInput(Device::Invalid, 0, 0, 0) {}
// Constructor from a wxKeyEvent. // Constructor from a wxKeyEvent.
UserInput(const wxKeyEvent& event); UserInput(const wxKeyEvent& event);
@ -42,7 +42,7 @@ public:
UserInput(const wxJoyEvent& event); UserInput(const wxJoyEvent& event);
// TODO: Remove this once all uses have been removed. // TODO: Remove this once all uses have been removed.
constexpr UserInput(int key = 0, int mod = 0, int joy = 0) UserInput(int key = 0, int mod = 0, int joy = 0)
: UserInput(joy == 0 ? Device::Keyboard : Device::Joystick, : UserInput(joy == 0 ? Device::Keyboard : Device::Joystick,
mod, mod,
key, key,
@ -88,7 +88,7 @@ public:
} }
private: private:
constexpr UserInput(Device device, int mod, int key, unsigned joy) UserInput(Device device, int mod, int key, unsigned joy)
: device_(device), : device_(device),
joystick_(joy == 0 ? wxJoystick::Invalid() joystick_(joy == 0 ? wxJoystick::Invalid()
: wxJoystick::FromLegacyPlayerIndex(joy)), : wxJoystick::FromLegacyPlayerIndex(joy)),

59
src/wx/vbam-options.cpp
View File

@ -1,6 +1,7 @@
#include "vbam-options.h" #include "vbam-options.h"
#include <variant> #include "nonstd/variant.hpp"
#include <wx/log.h> #include <wx/log.h>
#include <wx/translation.h> #include <wx/translation.h>
@ -143,41 +144,41 @@ VbamOption::VbamOption(VbamOptionID id, uint16_t* option) :
bool VbamOption::GetBool() const { bool VbamOption::GetBool() const {
assert(is_bool()); assert(is_bool());
return *(std::get<bool*>(value_)); return *(nonstd::get<bool*>(value_));
} }
double VbamOption::GetDouble() const { double VbamOption::GetDouble() const {
assert(is_double()); assert(is_double());
return *(std::get<double*>(value_)); return *(nonstd::get<double*>(value_));
} }
int32_t VbamOption::GetInt() const { int32_t VbamOption::GetInt() const {
assert(is_int()); assert(is_int());
return *(std::get<int32_t*>(value_)); return *(nonstd::get<int32_t*>(value_));
} }
uint32_t VbamOption::GetUnsigned() const { uint32_t VbamOption::GetUnsigned() const {
assert(is_unsigned()); assert(is_unsigned());
return *(std::get<uint32_t*>(value_)); return *(nonstd::get<uint32_t*>(value_));
} }
const wxString VbamOption::GetString() const { const wxString VbamOption::GetString() const {
assert(is_string()); assert(is_string());
return *(std::get<wxString*>(value_)); return *(nonstd::get<wxString*>(value_));
} }
wxString VbamOption::GetEnumString() const { wxString VbamOption::GetEnumString() const {
switch (type_) { switch (type_) {
case VbamOption::Type::kFilter: case VbamOption::Type::kFilter:
return internal::FilterToString(*(std::get<int32_t*>(value_))); return internal::FilterToString(*(nonstd::get<int32_t*>(value_)));
case VbamOption::Type::kInterframe: case VbamOption::Type::kInterframe:
return internal::InterframeToString(*(std::get<int32_t*>(value_))); return internal::InterframeToString(*(nonstd::get<int32_t*>(value_)));
case VbamOption::Type::kRenderMethod: case VbamOption::Type::kRenderMethod:
return internal::RenderMethodToString(*(std::get<int32_t*>(value_))); return internal::RenderMethodToString(*(nonstd::get<int32_t*>(value_)));
case VbamOption::Type::kAudioApi: case VbamOption::Type::kAudioApi:
return internal::AudioApiToString(*(std::get<int32_t*>(value_))); return internal::AudioApiToString(*(nonstd::get<int32_t*>(value_)));
case VbamOption::Type::kSoundQuality: case VbamOption::Type::kSoundQuality:
return internal::SoundQualityToString(*(std::get<int32_t*>(value_))); return internal::SoundQualityToString(*(nonstd::get<int32_t*>(value_)));
// We don't use default here to explicitly trigger a compiler warning when // We don't use default here to explicitly trigger a compiler warning when
// adding a new value. // adding a new value.
@ -199,7 +200,7 @@ wxString VbamOption::GetGbPaletteString() const {
assert(is_gb_palette()); assert(is_gb_palette());
wxString palette_string; wxString palette_string;
uint16_t const* value = std::get<uint16_t*>(value_); uint16_t const* value = nonstd::get<uint16_t*>(value_);
palette_string.Printf("%04X,%04X,%04X,%04X,%04X,%04X,%04X,%04X", palette_string.Printf("%04X,%04X,%04X,%04X,%04X,%04X,%04X,%04X",
value[0], value[1], value[2], value[3], value[0], value[1], value[2], value[3],
value[4], value[5], value[6], value[7]); value[4], value[5], value[6], value[7]);
@ -208,54 +209,54 @@ wxString VbamOption::GetGbPaletteString() const {
void VbamOption::SetBool(bool value) const { void VbamOption::SetBool(bool value) const {
assert(is_bool()); assert(is_bool());
*std::get<bool*>(value_) = value; *nonstd::get<bool*>(value_) = value;
} }
void VbamOption::SetDouble(double value) const { void VbamOption::SetDouble(double value) const {
assert(is_double()); assert(is_double());
if (value < std::get<double>(min_) || value > std::get<double>(max_)) { if (value < nonstd::get<double>(min_) || value > nonstd::get<double>(max_)) {
wxLogWarning( wxLogWarning(
_("Invalid value %f for option %s; valid values are %f - %f"), _("Invalid value %f for option %s; valid values are %f - %f"),
value, value,
config_name_, config_name_,
std::get<double>(min_), nonstd::get<double>(min_),
std::get<double>(max_)); nonstd::get<double>(max_));
return; return;
} }
*std::get<double*>(value_) = value; *nonstd::get<double*>(value_) = value;
} }
void VbamOption::SetInt(int32_t value) const { void VbamOption::SetInt(int32_t value) const {
assert(is_int()); assert(is_int());
if (value < std::get<int32_t>(min_) || value > std::get<int32_t>(max_)) { if (value < nonstd::get<int32_t>(min_) || value > nonstd::get<int32_t>(max_)) {
wxLogWarning( wxLogWarning(
_("Invalid value %d for option %s; valid values are %d - %d"), _("Invalid value %d for option %s; valid values are %d - %d"),
value, value,
config_name_, config_name_,
std::get<int32_t>(min_), nonstd::get<int32_t>(min_),
std::get<int32_t>(max_)); nonstd::get<int32_t>(max_));
return; return;
} }
*std::get<int32_t*>(value_) = value; *nonstd::get<int32_t*>(value_) = value;
} }
void VbamOption::SetUnsigned(uint32_t value) const { void VbamOption::SetUnsigned(uint32_t value) const {
assert(is_unsigned()); assert(is_unsigned());
if (value < std::get<uint32_t>(min_) || value > std::get<uint32_t>(max_)) { if (value < nonstd::get<uint32_t>(min_) || value > nonstd::get<uint32_t>(max_)) {
wxLogWarning( wxLogWarning(
_("Invalid value %d for option %s; valid values are %d - %d"), _("Invalid value %d for option %s; valid values are %d - %d"),
value, value,
config_name_, config_name_,
std::get<uint32_t>(min_), nonstd::get<uint32_t>(min_),
std::get<uint32_t>(max_)); nonstd::get<uint32_t>(max_));
return; return;
} }
*std::get<uint32_t*>(value_) = value; *nonstd::get<uint32_t*>(value_) = value;
} }
void VbamOption::SetString(const wxString& value) const { void VbamOption::SetString(const wxString& value) const {
assert(is_string()); assert(is_string());
*std::get<wxString*>(value_) = value; *nonstd::get<wxString*>(value_) = value;
} }
void VbamOption::SetEnumString(const wxString& value) const { void VbamOption::SetEnumString(const wxString& value) const {
@ -292,7 +293,7 @@ void VbamOption::SetEnumString(const wxString& value) const {
void VbamOption::SetEnumInt(int value) const { void VbamOption::SetEnumInt(int value) const {
assert(is_filter() || is_interframe() || is_render_method() || is_audio_api() || is_sound_quality()); assert(is_filter() || is_interframe() || is_render_method() || is_audio_api() || is_sound_quality());
if (value < std::get<int32_t>(min_) || value > std::get<int32_t>(max_)) { if (value < nonstd::get<int32_t>(min_) || value > nonstd::get<int32_t>(max_)) {
wxLogWarning( wxLogWarning(
_("Invalid value %d for option %s; valid values are %s"), _("Invalid value %d for option %s; valid values are %s"),
value, value,
@ -300,7 +301,7 @@ void VbamOption::SetEnumInt(int value) const {
internal::AllEnumValuesForType(type_)); internal::AllEnumValuesForType(type_));
return; return;
} }
*std::get<int32_t*>(value_) = value; *nonstd::get<int32_t*>(value_) = value;
} }
void VbamOption::SetGbPalette(const wxString& value) const { void VbamOption::SetGbPalette(const wxString& value) const {
@ -315,7 +316,7 @@ void VbamOption::SetGbPalette(const wxString& value) const {
config_name_); config_name_);
return; return;
} }
uint16_t* dest = std::get<uint16_t*>(value_); uint16_t* dest = nonstd::get<uint16_t*>(value_);
for (size_t i = 0; i < 8; i++) { for (size_t i = 0; i < 8; i++) {
wxString number = value.substr(i * 5, 4); wxString number = value.substr(i * 5, 4);

11
src/wx/vbam-options.h
View File

@ -1,8 +1,9 @@
#ifndef VBAM_OPTIONS_H #ifndef VBAM_OPTIONS_H
#define VBAM_OPTIONS_H #define VBAM_OPTIONS_H
#include "nonstd/variant.hpp"
#include <array> #include <array>
#include <variant>
#include <wx/string.h> #include <wx/string.h>
@ -253,8 +254,8 @@ private:
const wxString ux_helper_; const wxString ux_helper_;
const Type type_; const Type type_;
const std::variant< const nonstd::variant<
std::monostate, nonstd::monostate,
bool*, bool*,
double*, double*,
int32_t*, int32_t*,
@ -263,8 +264,8 @@ private:
uint16_t*> uint16_t*>
value_; value_;
const std::variant<std::monostate, double, int32_t, uint32_t> min_; const nonstd::variant<nonstd::monostate, double, int32_t, uint32_t> min_;
const std::variant<std::monostate, double, int32_t, uint32_t> max_; const nonstd::variant<nonstd::monostate, double, int32_t, uint32_t> max_;
}; };
#endif /* VBAM_OPTIONS_H */ #endif /* VBAM_OPTIONS_H */