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

got rid of UNIX_X11 - instead, use UNIX + X11_BACKEND

Browse source 
svn-id: r4632
This commit is contained in:
Max Horn 2002-07-25 21:34:06 +00:00
parent 0ee70aae3a
commit 9ad01eba91
5 changed files with 21 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

13
main.cpp
View file

@ -39,13 +39,18 @@ SoundMixer *g_mixer;
Config * scummcfg;
#if defined(MACOSX) && defined(UNIX)
#if defined(QTOPIA)
// FIXME - why exactly is this needed?
extern "C" int main(int argc, char *argv[]);
#endif
#if defined(MACOSX) || defined(QTOPIA)
#include <SDL.h>
#elif !defined(__MORPHOS__)
#undef main
#endif
#if defined(UNIX) || defined(UNIX_X11)
#if defined(UNIX)
#include <sys/param.h>
#ifndef MAXPATHLEN
#define MAXPATHLEN 256
@ -55,7 +60,7 @@ Config * scummcfg;
#define DEFAULT_CONFIG_FILE "scummvm.ini"
#endif
#if defined(UNIX) || defined(UNIX_X11)
#if defined(UNIX)
#include <signal.h>
#ifndef SCUMM_NEED_ALIGNMENT
@ -144,7 +149,7 @@ game settings!
dc_init_hardware();
#endif
#if defined(UNIX) || defined(UNIX_X11)
#if defined(UNIX)
char scummhome[MAXPATHLEN];
if(getenv("HOME") != NULL)
sprintf(scummhome,"%s/%s", getenv("HOME"), DEFAULT_CONFIG_FILE);