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

Also support X11 icon for minetest copies installed via make install (#4407)

Browse Source 
Fixes #4323.
This commit is contained in:
est31 2016-08-20 21:26:44 +02:00 committed by GitHub
parent 6590140260
commit f092dac979
5 changed files with 26 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CMakeLists.txt
View File

@ -175,6 +175,9 @@ if(UNIX AND NOT APPLE)
install(FILES "misc/minetest.desktop" DESTINATION "${XDG_APPS_DIR}") install(FILES "misc/minetest.desktop" DESTINATION "${XDG_APPS_DIR}")
install(FILES "misc/minetest.appdata.xml" DESTINATION "${APPDATADIR}") install(FILES "misc/minetest.appdata.xml" DESTINATION "${APPDATADIR}")
install(FILES "misc/minetest.svg" DESTINATION "${ICONDIR}/hicolor/scalable/apps") install(FILES "misc/minetest.svg" DESTINATION "${ICONDIR}/hicolor/scalable/apps")
install(FILES "misc/minetest-xorg-icon-128.png"
DESTINATION "${ICONDIR}/hicolor/128x128/apps"
RENAME "minetest.png")
endif() endif()
if(APPLE) if(APPLE)

3
src/client/clientlauncher.cpp
View File

@ -114,8 +114,7 @@ bool ClientLauncher::run(GameParams &game_params, const Settings &cmd_args)
porting::setXorgClassHint(video_driver->getExposedVideoData(), PROJECT_NAME_C); porting::setXorgClassHint(video_driver->getExposedVideoData(), PROJECT_NAME_C);
porting::setXorgWindowIcon(device, porting::setXorgWindowIcon(device);
porting::path_share + "/misc/minetest-xorg-icon-128.png");
/* /*
This changes the minimum allowed number of vertices in a VBO. This changes the minimum allowed number of vertices in a VBO.

1
src/cmake_config.h.in
View File

@ -14,6 +14,7 @@
#define STATIC_SHAREDIR "@SHAREDIR@" #define STATIC_SHAREDIR "@SHAREDIR@"
#define STATIC_LOCALEDIR "@LOCALEDIR@" #define STATIC_LOCALEDIR "@LOCALEDIR@"
#define BUILD_TYPE "@CMAKE_BUILD_TYPE@" #define BUILD_TYPE "@CMAKE_BUILD_TYPE@"
#define ICON_DIR "@ICONDIR@"
#cmakedefine01 RUN_IN_PLACE #cmakedefine01 RUN_IN_PLACE
#cmakedefine01 USE_GETTEXT #cmakedefine01 USE_GETTEXT
#cmakedefine01 USE_CURL #cmakedefine01 USE_CURL

19
src/porting.cpp
View File

@ -611,7 +611,24 @@ void setXorgClassHint(const video::SExposedVideoData &video_data,
#endif #endif
} }
bool setXorgWindowIcon(IrrlichtDevice *device, bool setXorgWindowIcon(IrrlichtDevice *device)
{
#if RUN_IN_PLACE
return setXorgWindowIconFromPath(device,
path_share + "/misc/" PROJECT_NAME "-xorg-icon-128.png");
#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.
return
setXorgWindowIconFromPath(device,
ICON_DIR "/hicolor/128x128/apps/" PROJECT_NAME ".png") ||
setXorgWindowIconFromPath(device,
path_share + "/misc/" PROJECT_NAME "-xorg-icon-128.png");
#endif
}
bool setXorgWindowIconFromPath(IrrlichtDevice *device,
const std::string &icon_file) const std::string &icon_file)
{ {
#ifdef XORG_USED #ifdef XORG_USED

4
src/porting.h
View File

@ -367,7 +367,9 @@ inline const char *getPlatformName()
void setXorgClassHint(const video::SExposedVideoData &video_data, void setXorgClassHint(const video::SExposedVideoData &video_data,
const std::string &name); const std::string &name);
bool setXorgWindowIcon(IrrlichtDevice *device, bool setXorgWindowIcon(IrrlichtDevice *device);
bool setXorgWindowIconFromPath(IrrlichtDevice *device,
const std::string &icon_file); const std::string &icon_file);
// This only needs to be called at the start of execution, since all future // This only needs to be called at the start of execution, since all future