MapleShrine
/
mkxp
1
0
Fork 0
Code Issues 32 Pull Requests 11 Projects Releases Wiki Activity

cmake build system + OS X support / cleanups for Humble Release #8

Merged
urkle merged 25 commits from OSX into boost 2014-01-01 23:13:17 +00:00
Conversation 2 Commits 25 Files Changed 22 +13
3 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 5b4f0b239c - Show all commits

1
src/config.cpp
View File

@ -67,6 +67,7 @@ void Config::read()
PO_DESC(gameFolder, std::string) \ PO_DESC(gameFolder, std::string) \
PO_DESC(anyAltToggleFS, bool) \ PO_DESC(anyAltToggleFS, bool) \
PO_DESC(allowSymlinks, bool) \ PO_DESC(allowSymlinks, bool) \
PO_DESC(iconPath, std::string) \
PO_DESC(customScript, std::string) PO_DESC(customScript, std::string)
// Not gonna take your shit boost // Not gonna take your shit boost

2
src/config.h
View File

@ -47,6 +47,8 @@ struct Config
bool anyAltToggleFS; bool anyAltToggleFS;
bool allowSymlinks; bool allowSymlinks;
std::string iconPath;
std::string customScript; std::string customScript;
std::vector<std::string> rtps; std::vector<std::string> rtps;

10
src/main.cpp
View File

@ -297,6 +297,16 @@ int main(int, char *argv[])
return 0; return 0;
} }
if (!conf.iconPath.empty())
{
SDL_Surface *iconImg = IMG_Load(conf.iconPath.c_str());
if (iconImg)
{
SDL_SetWindowIcon(win, iconImg);
SDL_FreeSurface(iconImg);
}
}
EventThread eventThread; EventThread eventThread;
RGSSThreadData rtData(&eventThread, argv[0], win, conf); RGSSThreadData rtData(&eventThread, argv[0], win, conf);