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

- full support for all megaglest modules to compile with the following:

Browse Source 
release / debug
 linux / windows
This commit is contained in:
Mark Vejvoda
2010-12-08 20:03:15 +00:00
parent 7341886b11
commit 7a7bc828f1
7 changed files with 81 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
source/g3d_viewer/main.cpp
View File

@@ -135,7 +135,13 @@ MainWindow::MainWindow(const string &modelPath)
wxInitAllImageHandlers();
#ifdef WIN32
wxIcon icon("IDI_ICON1");
#if defined(__MINGW32__)
wxIcon icon(ToUnicode("IDI_ICON1"));
#else
wxIcon icon("IDI_ICON1");
#endif
#else
wxIcon icon;
std::ifstream testFile("g3dviewer.ico");
@@ -978,7 +984,14 @@ bool App::OnInit(){
std::cout << "Press R to restart particles, this also reloads all files if they are changed." << std::endl << std::endl;
exit (0);
}
modelPath= wxFNCONV(argv[1]);
#if defined(__MINGW32__)
const wxWX2MBbuf tmp_buf = wxConvCurrent->cWX2MB(wxFNCONV(argv[1]));
modelPath = tmp_buf;
#else
modelPath = wxFNCONV(argv[1]);
#endif
}
mainWindow= new MainWindow(modelPath);