mirror-games/glest-source
1
0
Fork 0
mirror of https://github.com/glest/glest-source.git synced 2025-08-20 23:21:19 +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

10
source/g3d_viewer/main.cpp
View File

@@ -218,6 +218,7 @@ MainWindow::MainWindow( std::pair<string,vector<string> > unitToLoad,
Properties::setApplicationPath(executable_path(appPath));
Config &config = Config::getInstance();
string iniFilePath = extractDirectoryPathFromFile(config.getFileName(false));
//getGlPlatformExtensions();
int args[] = { WX_GL_RGBA, WX_GL_DOUBLEBUFFER, WX_GL_MIN_ALPHA, 8 }; // to prevent flicker
@@ -330,10 +331,11 @@ MainWindow::MainWindow( std::pair<string,vector<string> > unitToLoad,
#else
wxIcon icon;
std::ifstream testFile("g3dviewer.ico");
string icon_file = iniFilePath + "g3dviewer.ico";
std::ifstream testFile(icon_file.c_str());
if(testFile.good()) {
testFile.close();
icon.LoadFile(wxT("g3dviewer.ico"),wxBITMAP_TYPE_ICO);
icon.LoadFile(ToUnicode(icon_file.c_str()),wxBITMAP_TYPE_ICO);
}
#endif
SetIcon(icon);
@@ -1797,7 +1799,9 @@ END_EVENT_TABLE()
// class App
// ===============================================
bool App::OnInit(){
bool App::OnInit() {
SystemFlags::VERBOSE_MODE_ENABLED = true;
string modelPath="";
string particlePath="";
string projectileParticlePath="";