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

attempt to see if eariler init helps on macosx

Browse Source
This commit is contained in:
Mark Vejvoda 2011-11-01 20:07:18 +00:00
parent 279ef96fd1
commit e15d9cab5d
3 changed files with 50 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2466,8 +2466,8 @@ int glestMain(int argc, char** argv) {
if( haveSpecialOutputCommandLineOption == false || if( haveSpecialOutputCommandLineOption == false ||
hasCommandArgument(argc, argv,GAME_ARGS[GAME_ARG_VERSION]) == true) { hasCommandArgument(argc, argv,GAME_ARGS[GAME_ARG_VERSION]) == true) {
#ifdef USE_STREFLOP #ifdef USE_STREFLOP
# define STREFLOP_NO_DENORMALS //# define STREFLOP_NO_DENORMALS
streflop_init<streflop::Simple>(); // streflop_init<streflop::Simple>();
printf("%s, SVN: [%s], [STREFLOP]\n",getNetworkVersionString().c_str(),getSVNRevisionString().c_str()); printf("%s, SVN: [%s], [STREFLOP]\n",getNetworkVersionString().c_str(),getSVNRevisionString().c_str());
#else #else
printf("%s, SVN: [%s]\n",getNetworkVersionString().c_str(),getSVNRevisionString().c_str()); printf("%s, SVN: [%s]\n",getNetworkVersionString().c_str(),getSVNRevisionString().c_str());

67
source/shared_lib/include/platform/sdl/platform_main.h
View File

@ -277,26 +277,53 @@ bool hasCommandArgument(int argc, char** argv,const string argName, int *foundIn
return result; return result;
} }
#define MAIN_FUNCTION(X) int main(int argc, char **argv) \ int mainSetup(int argc, char **argv) {
{ \ bool haveSpecialOutputCommandLineOption = false;
if(hasCommandArgument(argc, argv,string(GAME_ARGS[GAME_ARG_HELP])) == true || \
hasCommandArgument(argc, argv,string(GAME_ARGS[GAME_ARG_VERSION])) == true || \ if( hasCommandArgument(argc, argv,GAME_ARGS[GAME_ARG_OPENGL_INFO]) == true ||
hasCommandArgument(argc, argv,string(GAME_ARGS[GAME_ARG_SHOW_INI_SETTINGS])) == true || \ hasCommandArgument(argc, argv,GAME_ARGS[GAME_ARG_SDL_INFO]) == true ||
hasCommandArgument(argc, argv,string(GAME_ARGS[GAME_ARG_MASTERSERVER_MODE])) == true) { \ hasCommandArgument(argc, argv,GAME_ARGS[GAME_ARG_LUA_INFO]) == true ||
if(SDL_Init(SDL_INIT_TIMER | SDL_INIT_JOYSTICK) < 0) { \ hasCommandArgument(argc, argv,GAME_ARGS[GAME_ARG_CURL_INFO]) == true ||
std::cerr << "Couldn't initialize SDL: " << SDL_GetError() << "\n"; \ hasCommandArgument(argc, argv,GAME_ARGS[GAME_ARG_VERSION]) == true ||
return 1; \ hasCommandArgument(argc, argv,GAME_ARGS[GAME_ARG_SHOW_INI_SETTINGS]) == true ||
} \ hasCommandArgument(argc, argv,GAME_ARGS[GAME_ARG_VALIDATE_TECHTREES]) == true ||
} \ hasCommandArgument(argc, argv,GAME_ARGS[GAME_ARG_VALIDATE_FACTIONS]) == true ||
else { \ hasCommandArgument(argc, argv,GAME_ARGS[GAME_ARG_VALIDATE_SCENARIO]) == true) {
if(SDL_Init(SDL_INIT_EVERYTHING) < 0) { \ haveSpecialOutputCommandLineOption = true;
std::cerr << "Couldn't initialize SDL: " << SDL_GetError() << "\n"; \ }
return 1; \
} \ if( haveSpecialOutputCommandLineOption == false) {
} \ #ifdef USE_STREFLOP
SDL_EnableUNICODE(1); \ #define STREFLOP_NO_DENORMALS
SDL_EnableKeyRepeat(SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL); \ streflop_init<streflop::Simple>();
int result = X(argc, argv); \ #endif
}
if(hasCommandArgument(argc, argv,string(GAME_ARGS[GAME_ARG_HELP])) == true ||
hasCommandArgument(argc, argv,string(GAME_ARGS[GAME_ARG_VERSION])) == true ||
hasCommandArgument(argc, argv,string(GAME_ARGS[GAME_ARG_SHOW_INI_SETTINGS])) == true ||
hasCommandArgument(argc, argv,string(GAME_ARGS[GAME_ARG_MASTERSERVER_MODE])) == true) {
if(SDL_Init(SDL_INIT_TIMER | SDL_INIT_JOYSTICK) < 0) {
std::cerr << "Couldn't initialize SDL: " << SDL_GetError() << "\n";
return 1;
}
}
else {
if(SDL_Init(SDL_INIT_EVERYTHING) < 0) {
std::cerr << "Couldn't initialize SDL: " << SDL_GetError() << "\n";
return 1;
}
}
SDL_EnableUNICODE(1);
SDL_EnableKeyRepeat(SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
return 0;
}
#define MAIN_FUNCTION(X) int main(int argc, char **argv) { \
int result = mainSetup(argc,argv); \
if(result == 0) { \
result = X(argc, argv); \
} \
return result; \ return result; \
} }

1
source/shared_lib/sources/graphics/gl/font_textFTGL.cpp
View File

@ -40,6 +40,7 @@ int TextFTGL::faceResolution = 72;
//==================================================================== //====================================================================
TextFTGL::TextFTGL(FontTextHandlerType type) : Text(type) { TextFTGL::TextFTGL(FontTextHandlerType type) : Text(type) {
//throw runtime_error("FTGL!");
//setenv("MEGAGLEST_FONT","/usr/share/fonts/truetype/wqy/wqy-zenhei.ttc",0); //setenv("MEGAGLEST_FONT","/usr/share/fonts/truetype/wqy/wqy-zenhei.ttc",0);
//setenv("MEGAGLEST_FONT","/usr/share/fonts/truetype/arphic/uming.ttc",0); // Chinese //setenv("MEGAGLEST_FONT","/usr/share/fonts/truetype/arphic/uming.ttc",0); // Chinese
//setenv("MEGAGLEST_FONT","/usr/share/fonts/truetype/arphic/ukai.ttc",0); // Chinese //setenv("MEGAGLEST_FONT","/usr/share/fonts/truetype/arphic/ukai.ttc",0); // Chinese