archive/Cemu
1
0
Fork 0
mirror of https://github.com/cemu-project/Cemu.git synced 2025-07-03 21:41:19 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Initial macOS port bringup (#52)

Browse source
This commit is contained in:
Marcin Chojnacki 2022-08-26 04:03:26 +02:00 • committed by GitHub
parent a2abffd37b
commit 974edaa649
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
84 changed files with 157 additions and 122 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/gui/MainWindow.cpp
View file

@ -50,12 +50,12 @@
#include "gui/input/InputSettings2.h"
#include "input/InputManager.h"
#if BOOST_OS_WINDOWS > 0
#if BOOST_OS_WINDOWS
#define exit(__c) ExitProcess(__c)
#endif
#if BOOST_OS_LINUX > 0
#include "resource/linux/resources.h"
#if BOOST_OS_LINUX || BOOST_OS_MACOS
#include "resource/embedded/resources.h"
#endif
#include "Cafe/TitleList/TitleInfo.h"
@ -296,7 +296,7 @@ MainWindow::MainWindow()
SetClientSize(1280, 720);
SetIcon(wxICON(M_WND_ICON128));
#if BOOST_OS_WINDOWS > 0
#if BOOST_OS_WINDOWS
HICON hWindowIcon = (HICON)LoadImageA(NULL, "M_WND_ICON16", IMAGE_ICON, 16, 16, LR_LOADFROMFILE);
SendMessage(this->GetHWND(), WM_SETICON, ICON_SMALL, (LPARAM)hWindowIcon);
#endif
@ -650,7 +650,7 @@ void MainWindow::OnInstallUpdate(wxCommandEvent& event)
break;
if (modalChoice == wxID_OK)
{
#if BOOST_OS_LINUX
#if BOOST_OS_LINUX || BOOST_OS_MACOS
fs::path dirPath((const char*)(openDirDialog.GetPath().fn_str()));
#else
fs::path dirPath(openDirDialog.GetPath().fn_str());