diff --git a/source/glest_game/main/main.cpp b/source/glest_game/main/main.cpp index dfe00e0ce..ee267fa76 100644 --- a/source/glest_game/main/main.cpp +++ b/source/glest_game/main/main.cpp @@ -424,7 +424,7 @@ void MainWindow::setProgram(Program *program) { // ===================================================== SystemFlags debugger; -bool hasCommandArgument(int argc, const char** argv,const string argName, int *foundIndex=NULL, int startLookupIndex=1,bool useArgParamLen=false) { +bool hasCommandArgument(int argc, char** argv,const string argName, int *foundIndex=NULL, int startLookupIndex=1,bool useArgParamLen=false) { bool result = false; if(foundIndex != NULL) { @@ -448,7 +448,7 @@ bool hasCommandArgument(int argc, const char** argv,const string argName, int *f return result; } -int glestMain(int argc, const char** argv){ +int glestMain(int argc, char** argv){ #ifdef SL_LEAK_DUMP AllocRegistry memoryLeaks = AllocRegistry::getInstance(); @@ -457,7 +457,7 @@ int glestMain(int argc, const char** argv){ bool foundInvalidArgs = false; const int knownArgCount = sizeof(GAME_ARGS) / sizeof(GAME_ARGS[0]); for(int idx = 1; idx < argc; ++idx) { - if( hasCommandArgument(knownArgCount, GAME_ARGS,argv[idx],NULL,0,true) == false) { + if( hasCommandArgument(knownArgCount, (char **)&GAME_ARGS[0], argv[idx], NULL, 0, true) == false) { foundInvalidArgs = true; printf("\nInvalid argument: %s",argv[idx]); } diff --git a/source/shared_lib/include/platform/sdl/platform_main.h b/source/shared_lib/include/platform/sdl/platform_main.h index 0d870f36d..4f349695d 100644 --- a/source/shared_lib/include/platform/sdl/platform_main.h +++ b/source/shared_lib/include/platform/sdl/platform_main.h @@ -14,8 +14,8 @@ #include #include -#define MAIN_FUNCTION(X) int main(int argc, const char **argv) \ -{ \ +#define MAIN_FUNCTION(X) int main(int argc, char **argv) \ +{ \ if(SDL_Init(SDL_INIT_EVERYTHING) < 0) { \ std::cerr << "Couldn't initialize SDL: " << SDL_GetError() << "\n"; \ return 1; \