mirror-games/glest-source
1
0
Fork 0
mirror of https://github.com/glest/glest-source.git synced 2025-10-03 10:51:55 +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

29
source/glest_map_editor/main.cpp
View File

@@ -338,33 +338,36 @@ void MainWindow::init(string fname) {
toolbar2->AddTool(miRadius + 9, _("radius9"), wxBitmap(radius_9), _("9 (17x17)"));
toolbar2->Realize();
Config &config = Config::getInstance();
string iniFilePath = extractDirectoryPathFromFile(config.getFileName(false));
string userData = config.getString("UserData_Root","");
if(userData != "") {
endPathWithSlash(userData);
}
//std::cout << "A" << std::endl;
wxInitAllImageHandlers();
#ifdef WIN32
//std::cout << "B" << std::endl;
#if defined(__MINGW32__)
wxIcon icon(ToUnicode("IDI_ICON1"));
#else
wxIcon icon("IDI_ICON1");
#endif
#if defined(__MINGW32__)
wxIcon icon(ToUnicode("IDI_ICON1"));
#else
wxIcon icon("IDI_ICON1");
#endif
#else
//std::cout << "B" << std::endl;
wxIcon icon;
std::ifstream testFile("editor.ico");
string icon_file = iniFilePath + "editor.ico";
std::ifstream testFile(icon_file.c_str());
if(testFile.good()) {
testFile.close();
icon.LoadFile(wxT("editor.ico"),wxBITMAP_TYPE_ICO);
icon.LoadFile(ToUnicode(icon_file.c_str()),wxBITMAP_TYPE_ICO);
}
#endif
//std::cout << "C" << std::endl;
SetIcon(icon);
fileDialog = new wxFileDialog(this);
Config &config = Config::getInstance();
string userData = config.getString("UserData_Root","");
if(userData != "") {
endPathWithSlash(userData);
}
string defaultPath = userData + "maps/";
fileDialog->SetDirectory(ToUnicode(defaultPath));
@@ -1387,6 +1390,8 @@ bool SimpleDialog::show(const string &title, bool wide) {
// ===============================================
bool App::OnInit() {
SystemFlags::VERBOSE_MODE_ENABLED = true;
string fileparam;
if(argc==2){
if(argv[1][0]=='-') { // any flag gives help and exits program.