BRNSystems/minetest
1
0
Fork 0
forked from Mirrorlandia_minetest/minetest
Code Pull Requests 1 Activity

Fix android build

Browse Source 
Fixes #4493.
This commit is contained in:
est31 2016-09-30 14:30:37 +02:00
parent 45a9145a4b
commit 33a606c034
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/porting.cpp
View File

@ -613,10 +613,11 @@ void setXorgClassHint(const video::SExposedVideoData &video_data,
bool setXorgWindowIcon(IrrlichtDevice *device) bool setXorgWindowIcon(IrrlichtDevice *device)
{ {
#if RUN_IN_PLACE #ifdef XORG_USED
# if RUN_IN_PLACE
return setXorgWindowIconFromPath(device, return setXorgWindowIconFromPath(device,
path_share + "/misc/" PROJECT_NAME "-xorg-icon-128.png"); path_share + "/misc/" PROJECT_NAME "-xorg-icon-128.png");
#else # else
// We have semi-support for reading in-place data if we are // We have semi-support for reading in-place data if we are
// compiled with RUN_IN_PLACE. Don't break with this and // compiled with RUN_IN_PLACE. Don't break with this and
// also try the path_share location. // also try the path_share location.
@ -625,6 +626,8 @@ bool setXorgWindowIcon(IrrlichtDevice *device)
ICON_DIR "/hicolor/128x128/apps/" PROJECT_NAME ".png") || ICON_DIR "/hicolor/128x128/apps/" PROJECT_NAME ".png") ||
setXorgWindowIconFromPath(device, setXorgWindowIconFromPath(device,
path_share + "/misc/" PROJECT_NAME "-xorg-icon-128.png"); path_share + "/misc/" PROJECT_NAME "-xorg-icon-128.png");
# endif
return false;
#endif #endif
} }