chore: Replace old required mac os version checks with if WINAPI_CARBON
This commit is contained in:
@ -195,7 +195,7 @@ void App::runEventsLoop(void *)
|
||||
{
|
||||
m_events->loop();
|
||||
|
||||
#if defined(MAC_OS_X_VERSION_10_7)
|
||||
#if WINAPI_CARBON
|
||||
|
||||
stopCocoaLoop();
|
||||
|
||||
|
||||
@ -44,6 +44,8 @@
|
||||
#endif
|
||||
|
||||
#if WINAPI_CARBON
|
||||
#include "base/TMethodJob.h"
|
||||
#include "mt/Thread.h"
|
||||
#include "platform/OSXDragSimulator.h"
|
||||
#include "platform/OSXScreen.h"
|
||||
#endif
|
||||
@ -52,11 +54,6 @@
|
||||
#include "platform/Wayland.h"
|
||||
#endif
|
||||
|
||||
#if defined(MAC_OS_X_VERSION_10_7)
|
||||
#include "base/TMethodJob.h"
|
||||
#include "mt/Thread.h"
|
||||
#endif
|
||||
|
||||
#include <memory>
|
||||
#include <sstream>
|
||||
#include <stdio.h>
|
||||
@ -455,7 +452,7 @@ int ClientApp::mainLoop()
|
||||
// that.
|
||||
DAEMON_RUNNING(true);
|
||||
|
||||
#if defined(MAC_OS_X_VERSION_10_7)
|
||||
#if WINAPI_CARBON
|
||||
|
||||
Thread thread(new TMethodJob<ClientApp>(this, &ClientApp::runEventsLoop, NULL));
|
||||
|
||||
|
||||
@ -47,6 +47,8 @@
|
||||
#endif
|
||||
|
||||
#if WINAPI_CARBON
|
||||
#include "base/TMethodJob.h"
|
||||
#include "mt/Thread.h"
|
||||
#include "platform/OSXDragSimulator.h"
|
||||
#include "platform/OSXScreen.h"
|
||||
#endif
|
||||
@ -55,11 +57,6 @@
|
||||
#include "platform/Wayland.h"
|
||||
#endif
|
||||
|
||||
#if defined(MAC_OS_X_VERSION_10_7)
|
||||
#include "base/TMethodJob.h"
|
||||
#include "mt/Thread.h"
|
||||
#endif
|
||||
|
||||
#include <fstream>
|
||||
#include <iostream>
|
||||
#include <sstream>
|
||||
@ -683,7 +680,7 @@ int ServerApp::mainLoop()
|
||||
// that.
|
||||
DAEMON_RUNNING(true);
|
||||
|
||||
#if defined(MAC_OS_X_VERSION_10_7)
|
||||
#if WINAPI_CARBON
|
||||
|
||||
Thread thread(new TMethodJob<ServerApp>(this, &ServerApp::runEventsLoop, NULL));
|
||||
|
||||
|
||||
Reference in New Issue
Block a user