Skip to content

Commit

Permalink
Fix android build
Browse files Browse the repository at this point in the history
Fixes #4493.
  • Loading branch information
est31 committed Sep 30, 2016
1 parent 45a9145 commit 33a606c
Showing 1 changed file with 5 additions and 2 deletions.
7 changes: 5 additions & 2 deletions src/porting.cpp
Expand Up @@ -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.
Expand All @@ -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
}

Expand Down

0 comments on commit 33a606c

Please sign in to comment.