mirror of
https://github.com/cemu-project/Cemu.git
synced 2025-07-10 17:01:17 +12:00
Fix some issues with building on macOS (#268)
* fixed building on macos, needs OBJC and OBJXX to be enabled * changed to weak ordering due to string comparison not being strong ordering * Use raw PNG bytes from "resource/embedded/resources.h" in all windows too
This commit is contained in:
parent
12b6830546
commit
867c0c5ca2
5 changed files with 20 additions and 21 deletions
|
@ -39,9 +39,8 @@
|
|||
|
||||
#include "Cafe/TitleList/TitleList.h"
|
||||
|
||||
#if BOOST_OS_LINUX || BOOST_OS_MACOS
|
||||
#include "resource/embedded/resources.h"
|
||||
#endif
|
||||
|
||||
#include "Cafe/TitleList/SaveList.h"
|
||||
|
||||
wxDEFINE_EVENT(wxEVT_TITLE_FOUND, wxCommandEvent);
|
||||
|
@ -63,14 +62,14 @@ wxPanel* TitleManager::CreateTitleManagerPage()
|
|||
m_filter->Bind(wxEVT_TEXT, &TitleManager::OnFilterChanged, this);
|
||||
row->Add(m_filter, 1, wxALL | wxEXPAND, 5);
|
||||
|
||||
const wxImage refresh = wxBITMAP_PNG(PNG_REFRESH).ConvertToImage();
|
||||
const wxImage refresh = wxBITMAP_PNG_FROM_DATA(PNG_REFRESH).ConvertToImage();
|
||||
m_refresh_button = new wxBitmapButton(panel, wxID_ANY, refresh.Scale(16, 16));
|
||||
m_refresh_button->Disable();
|
||||
m_refresh_button->Bind(wxEVT_BUTTON, &TitleManager::OnRefreshButton, this);
|
||||
m_refresh_button->SetToolTip(_("Refresh"));
|
||||
row->Add(m_refresh_button, 0, wxALIGN_CENTER_VERTICAL | wxALL, 5);
|
||||
|
||||
auto* help_button = new wxStaticBitmap(panel, wxID_ANY, wxBITMAP_PNG(PNG_HELP));
|
||||
auto* help_button = new wxStaticBitmap(panel, wxID_ANY, wxBITMAP_PNG_FROM_DATA(PNG_HELP));
|
||||
help_button->SetToolTip(wxStringFormat2(_("The following prefixes are supported:\n{0}\n{1}\n{2}\n{3}\n{4}"),
|
||||
"titleid:", "name:", "type:", "version:", "region:"));
|
||||
row->Add(help_button, 0, wxALIGN_CENTER_VERTICAL | wxALL, 5);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue