thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fully and officially renamed our main function to scummvm_main, thus making

Browse source 
various backend specific hacks unnecessary. As a consequence, it is now the
responsibility of the backend to define main. Hence I adapted the SDL backend
accordingly.

svn-id: r21542
This commit is contained in:
Max Horn 2006-04-02 00:08:22 +00:00
parent a2c4795f32
commit 587431f8e8
15 changed files with 57 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

10
base/main.cpp
View file

@ -155,12 +155,6 @@ const char* stackCookie = "$STACK: 655360\0";
extern "C" int main(int argc, char *argv[]);
#endif
#if defined(MACOSX) || defined(QTOPIA) || defined(__SYMBIAN32__)
#include <SDL.h>
#elif !defined(__MORPHOS__) && !defined(__DC__) && !defined(__GP32__)
#undef main
#endif
#if defined (ALLEGRO_BACKEND)
#include "allegro.h"
#endif
@ -344,10 +338,8 @@ static int runGame(GameDetector &detector, OSystem &system, const Common::String
#ifdef _WIN32_WCE
extern "C" int scummvm_main(GameDetector &detector, int argc, char *argv[]) {
#elif defined(__PLAYSTATION2__) || defined(__PSP__) || defined(__GP32__) || defined(__MAEMO__)
extern "C" int scummvm_main(int argc, char *argv[]) {
#else
extern "C" int main(int argc, char *argv[]) {
extern "C" int scummvm_main(int argc, char *argv[]) {
#endif
char *cfgFilename = NULL;
Common::String specialDebug = "";