jyapayne/moonlight-qt
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix macos build: for macos, Q_OS_UNIX is also defined

Browse source
This commit is contained in:
R. Aidan Campbell 2018-07-21 14:31:37 -07:00
commit c816a6198c
2 changed files with 3 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/app.pro
View file

@ -67,7 +67,7 @@ win32 {
macx { macx {
SOURCES += streaming/video/ffmpeg-renderers/vt.mm SOURCES += streaming/video/ffmpeg-renderers/vt.mm
} }
unix { unix:!macx {
SOURCES += streaming/video/ffmpeg-renderers/vaapi.cpp SOURCES += streaming/video/ffmpeg-renderers/vaapi.cpp
} }

7
app/streaming/video/ffmpeg.cpp
View file

@ -7,9 +7,7 @@
#ifdef __APPLE__ #ifdef __APPLE__
#include "ffmpeg-renderers/vt.h" #include "ffmpeg-renderers/vt.h"
#endif #elif defined Q_OS_UNIX
#ifdef Q_OS_UNIX
#include "ffmpeg-renderers/vaapi.h" #include "ffmpeg-renderers/vaapi.h"
#endif #endif
@ -73,8 +71,7 @@ bool FFmpegVideoDecoder::chooseDecoder(
case AV_HWDEVICE_TYPE_VIDEOTOOLBOX: case AV_HWDEVICE_TYPE_VIDEOTOOLBOX:
newRenderer = VTRendererFactory::createRenderer(); newRenderer = VTRendererFactory::createRenderer();
break; break;
#endif #elif defined Q_OS_UNIX
#ifdef Q_OS_UNIX
case AV_HWDEVICE_TYPE_VAAPI: case AV_HWDEVICE_TYPE_VAAPI:
newRenderer = new VAAPIRenderer(); newRenderer = new VAAPIRenderer();
break; break;