summaryrefslogtreecommitdiff
path: root/src/porting.cpp
diff options
context:
space:
mode:
authorest31 <MTest31@outlook.com>2016-09-30 14:30:37 +0200
committerest31 <MTest31@outlook.com>2016-09-30 15:27:36 +0200
commit33a606c034a6dfea4a011b6d69077455bbb56746 (patch)
tree6a8b3fc8d873ca453762eb9c2016e6dd3b171ab8 /src/porting.cpp
parent45a9145a4bd44a677c77687880d0b0acb7e6b421 (diff)
downloadminetest-33a606c034a6dfea4a011b6d69077455bbb56746.tar.gz
minetest-33a606c034a6dfea4a011b6d69077455bbb56746.tar.bz2
minetest-33a606c034a6dfea4a011b6d69077455bbb56746.zip
Fix android build
Fixes #4493.
Diffstat (limited to 'src/porting.cpp')
-rw-r--r--src/porting.cpp7
1 files 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
}