mirror-games/glest-source
1
0
Fork 0
mirror of https://github.com/glest/glest-source.git synced 2025-08-18 14:11:15 +02:00
Code Issues Projects Releases Wiki Activity

- lots of updates including:

Browse Source 
- cmake system changes (after doing a make you may go: sudo make install to install in standard linux paths)
- updates to various pathing in order to more robustly support lhs

*WARNING, Linux dev's should run cmake like the following to avoid pathing issues as the default now is lhs paths:
cmake -DCMAKE_INSTALL_PREFIX= ..    (notice the SPACE before the ..)
This commit is contained in:
Mark Vejvoda
2011-05-03 23:34:25 +00:00
parent e4f0e8bfbf
commit fab36598b1
17 changed files with 237 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
source/shared_lib/sources/platform/sdl/gl_wrap.cpp
View File

@@ -66,14 +66,24 @@ void PlatformContextGl::init(int colorBits, int depthBits, int stencilBits,bool
int resH = PlatformCommon::Private::ScreenHeight;
#ifndef WIN32
if(fileExists("megaglest.bmp")) {
string mg_icon_file = "";
#if defined(CUSTOM_DATA_INSTALL_PATH_VALUE)
if(fileExists(CUSTOM_DATA_INSTALL_PATH_VALUE + "megaglest.bmp")) {
mg_icon_file = CUSTOM_DATA_INSTALL_PATH_VALUE + "megaglest.bmp";
}
#endif
if(mg_icon_file == "" && fileExists("megaglest.bmp")) {
mg_icon_file = "megaglest.bmp";
}
if(mg_icon_file != "") {
if(icon != NULL) {
SDL_FreeSurface(icon);
icon = NULL;
}
icon = SDL_LoadBMP("megaglest.bmp");
icon = SDL_LoadBMP(mg_icon_file.c_str());
//SDL_Surface *icon = IMG_Load("megaglest.ico");

8
source/shared_lib/sources/util/properties.cpp
View File

@@ -141,6 +141,14 @@ bool Properties::applyTagsToValue(string &value) {
replaceAll(value, "$APPLICATIONPATH", Properties::applicationPath);
replaceAll(value, "%%APPLICATIONPATH%%", Properties::applicationPath);
#if defined(CUSTOM_DATA_INSTALL_PATH)
replaceAll(value, "$APPLICATIONDATAPATH", CUSTOM_DATA_INSTALL_PATH);
replaceAll(value, "%%APPLICATIONDATAPATH%%", CUSTOM_DATA_INSTALL_PATH);
#else
replaceAll(value, "$APPLICATIONDATAPATH", Properties::applicationPath);
replaceAll(value, "%%APPLICATIONDATAPATH%%", Properties::applicationPath);
#endif
return (originalValue != value);
}