From 33a606c034a6dfea4a011b6d69077455bbb56746 Mon Sep 17 00:00:00 2001 From: est31 Date: Fri, 30 Sep 2016 14:30:37 +0200 Subject: [PATCH] Fix android build Fixes #4493. --- src/porting.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/porting.cpp b/src/porting.cpp index ae9114ac8..f0337b610 100644 --- a/src/porting.cpp +++ b/src/porting.cpp @@ -613,10 +613,11 @@ void setXorgClassHint(const video::SExposedVideoData &video_data, bool setXorgWindowIcon(IrrlichtDevice *device) { -#if RUN_IN_PLACE +#ifdef XORG_USED +# if RUN_IN_PLACE return setXorgWindowIconFromPath(device, path_share + "/misc/" PROJECT_NAME "-xorg-icon-128.png"); -#else +# else // We have semi-support for reading in-place data if we are // compiled with RUN_IN_PLACE. Don't break with this and // also try the path_share location. @@ -625,6 +626,8 @@ bool setXorgWindowIcon(IrrlichtDevice *device) ICON_DIR "/hicolor/128x128/apps/" PROJECT_NAME ".png") || setXorgWindowIconFromPath(device, path_share + "/misc/" PROJECT_NAME "-xorg-icon-128.png"); +# endif + return false; #endif } -- 2.25.1