Fix android build
authorest31 <MTest31@outlook.com>
Fri, 30 Sep 2016 12:30:37 +0000 (14:30 +0200)
committerest31 <MTest31@outlook.com>
Fri, 30 Sep 2016 13:27:36 +0000 (15:27 +0200)
Fixes #4493.

src/porting.cpp

index ae9114ac8c9f5b404ec1fcfbe41aa84235835b81..f0337b6102f2cbb3d90fb22a1627f1f8ce497ac4 100644 (file)
@@ -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
 }