Rampoina/MegaGlest
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

another attempt to fix things on macosx

Browse Source
This commit is contained in:
Mark Vejvoda 2011-11-01 21:17:24 +00:00
parent e15d9cab5d
commit 193354865c
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
source/glest_game/main/main.cpp
View File

@ -2846,6 +2846,11 @@ int glestMain(int argc, char** argv) {
} }
Renderer &renderer= Renderer::getInstance(); Renderer &renderer= Renderer::getInstance();
//#if defined(__APPLE__)
program= new Program();
mainWindow= new MainWindow(program);
//#endif
lang.loadStrings(language); lang.loadStrings(language);
if( lang.hasString("FONT_HEIGHT_TEXT")) { if( lang.hasString("FONT_HEIGHT_TEXT")) {
@ -3068,11 +3073,15 @@ int glestMain(int argc, char** argv) {
//return -1; //return -1;
// //
program= new Program(); if(program == NULL) {
program= new Program();
}
SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line: %d]\n",__FILE__,__FUNCTION__,__LINE__); SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line: %d]\n",__FILE__,__FUNCTION__,__LINE__);
mainWindow= new MainWindow(program); if(mainWindow == NULL) {
mainWindow= new MainWindow(program);
}
mainWindow->setUseDefaultCursorOnly(config.getBool("No2DMouseRendering","false")); mainWindow->setUseDefaultCursorOnly(config.getBool("No2DMouseRendering","false"));