build: Replace WINAPI_MSWINDOWS with Q_OS_WIN
This commit is contained in:
committed by
Chris Rizzitello
parent
f2a54f4af0
commit
e4cf1392c9
@ -103,7 +103,6 @@ set(REQUIRED_LIBPORTAL_VERSION 0.9.1)
|
|||||||
set(REQUIRED_QT_VERSION 6.7.0)
|
set(REQUIRED_QT_VERSION 6.7.0)
|
||||||
|
|
||||||
if (WIN32)
|
if (WIN32)
|
||||||
add_definitions(-DWINAPI_MSWINDOWS)
|
|
||||||
# VSCMD_ARG_TGT_ARCH is set on CI
|
# VSCMD_ARG_TGT_ARCH is set on CI
|
||||||
if ("$ENV{VSCMD_ARG_TGT_ARCH}" STREQUAL "")
|
if ("$ENV{VSCMD_ARG_TGT_ARCH}" STREQUAL "")
|
||||||
# NOT on CI
|
# NOT on CI
|
||||||
|
|||||||
@ -22,7 +22,7 @@
|
|||||||
#include "net/SocketMultiplexer.h"
|
#include "net/SocketMultiplexer.h"
|
||||||
#include "net/TCPSocketFactory.h"
|
#include "net/TCPSocketFactory.h"
|
||||||
|
|
||||||
#if WINAPI_MSWINDOWS
|
#if defined(Q_OS_WIN)
|
||||||
#include "platform/MSWindowsScreen.h"
|
#include "platform/MSWindowsScreen.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
@ -104,7 +104,7 @@ const char *ClientApp::daemonName() const
|
|||||||
|
|
||||||
deskflow::Screen *ClientApp::createScreen()
|
deskflow::Screen *ClientApp::createScreen()
|
||||||
{
|
{
|
||||||
#if WINAPI_MSWINDOWS
|
#if defined(Q_OS_WIN)
|
||||||
return new deskflow::Screen(
|
return new deskflow::Screen(
|
||||||
new MSWindowsScreen(
|
new MSWindowsScreen(
|
||||||
false, Settings::value(Settings::Core::UseHooks).toBool(), getEvents(),
|
false, Settings::value(Settings::Core::UseHooks).toBool(), getEvents(),
|
||||||
|
|||||||
@ -30,7 +30,7 @@
|
|||||||
// must be before screen header includes
|
// must be before screen header includes
|
||||||
#include <QFileInfo>
|
#include <QFileInfo>
|
||||||
|
|
||||||
#if WINAPI_MSWINDOWS
|
#if defined(Q_OS_WIN)
|
||||||
#include "platform/MSWindowsScreen.h"
|
#include "platform/MSWindowsScreen.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
@ -392,7 +392,7 @@ bool ServerApp::startServer()
|
|||||||
|
|
||||||
deskflow::Screen *ServerApp::createScreen()
|
deskflow::Screen *ServerApp::createScreen()
|
||||||
{
|
{
|
||||||
#if WINAPI_MSWINDOWS
|
#if defined(Q_OS_WIN)
|
||||||
return new deskflow::Screen(
|
return new deskflow::Screen(
|
||||||
new MSWindowsScreen(true, Settings::value(Settings::Core::UseHooks).toBool(), getEvents()), getEvents()
|
new MSWindowsScreen(true, Settings::value(Settings::Core::UseHooks).toBool(), getEvents()), getEvents()
|
||||||
);
|
);
|
||||||
|
|||||||
Reference in New Issue
Block a user