diff options
| -rw-r--r-- | backends/platform/posix/main.cpp | 46 | ||||
| -rw-r--r-- | backends/platform/posix/module.mk | 11 | ||||
| -rw-r--r-- | backends/platform/posix/posix.cpp | 136 | ||||
| -rw-r--r-- | backends/platform/posix/posix.h | 42 | ||||
| -rw-r--r-- | backends/platform/sdl/main.cpp | 2 | ||||
| -rw-r--r-- | backends/platform/win32/win32.cpp | 2 | ||||
| -rwxr-xr-x | configure | 15 |
7 files changed, 247 insertions, 7 deletions
diff --git a/backends/platform/posix/main.cpp b/backends/platform/posix/main.cpp new file mode 100644 index 0000000000..35813291c1 --- /dev/null +++ b/backends/platform/posix/main.cpp @@ -0,0 +1,46 @@ +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + * $URL$ + * $Id$ + * + */ + +#include "common/scummsys.h" + +#include "backends/platform/posix/posix.h" +#include "backends/plugins/sdl/sdl-provider.h" +#include "base/main.h" + +int main(int argc, char *argv[]) { + + // Create our OSystem instance + g_system = new OSystem_POSIX(); + assert(g_system); + +#ifdef DYNAMIC_MODULES + PluginManager::instance().addPluginProvider(new SDLPluginProvider()); +#endif + + // Invoke the actual ScummVM main entry point: + int res = scummvm_main(argc, argv); + delete (OSystem_POSIX *)g_system; + return res; +} diff --git a/backends/platform/posix/module.mk b/backends/platform/posix/module.mk new file mode 100644 index 0000000000..b1827c7578 --- /dev/null +++ b/backends/platform/posix/module.mk @@ -0,0 +1,11 @@ +MODULE := backends/platform/posix + +MODULE_OBJS := \ + main.o \ + posix.o + +MODULE_DIRS += \ + backends/platform/posix/ + +# We don't use the rules.mk here on purpose +OBJS := $(addprefix $(MODULE)/, $(MODULE_OBJS)) $(OBJS) diff --git a/backends/platform/posix/posix.cpp b/backends/platform/posix/posix.cpp new file mode 100644 index 0000000000..8942ba1408 --- /dev/null +++ b/backends/platform/posix/posix.cpp @@ -0,0 +1,136 @@ +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + * $URL$ + * $Id$ + * + */ + +#include "backends/platform/posix/posix.h" +#include "common/archive.h" +#include "common/config-manager.h" +#include "common/debug.h" +#include "common/util.h" +#include "common/EventRecorder.h" + +#include "backends/saves/posix/posix-saves.h" + +#include "backends/audiocd/sdl/sdl-audiocd.h" +#include "backends/events/sdl/sdl-events.h" +#include "backends/mutex/sdl/sdl-mutex.h" +#include "backends/mixer/sdl/sdl-mixer.h" +#include "backends/timer/sdl/sdl-timer.h" + +#include "backends/fs/posix/posix-fs-factory.h" + +#define DEFAULT_CONFIG_FILE ".scummvmrc" + +OSystem_POSIX::OSystem_POSIX() { + _fsFactory = new POSIXFilesystemFactory(); +} + +OSystem_POSIX::~OSystem_POSIX() { + deinit(); +} + +void OSystem_POSIX::initBackend() { + assert(!_inited); + + uint32 sdlFlags = 0; + + if (ConfMan.hasKey("disable_sdl_parachute")) + sdlFlags |= SDL_INIT_NOPARACHUTE; + + if (SDL_Init(sdlFlags) == -1) { + error("Could not initialize SDL: %s", SDL_GetError()); + } + + // Enable unicode support if possible + SDL_EnableUNICODE(1); + + // Create and hook up the mutex manager, if none exists yet (we check for + // this to allow subclasses to provide their own). + if (_mutexManager == 0) { + _mutexManager = new SdlMutexManager(); + } + + // Create and hook up the event manager, if none exists yet (we check for + // this to allow subclasses to provide their own). + if (_eventManager == 0) { + _eventManager = new SdlEventManager(this); + } + + // Create the savefile manager, if none exists yet (we check for this to + // allow subclasses to provide their own). + if (_savefileManager == 0) { + _savefileManager = new POSIXSaveFileManager(); + } + + // Create and hook up the mixer, if none exists yet (we check for this to + // allow subclasses to provide their own). + if (_mixer == 0) { + if (SDL_InitSubSystem(SDL_INIT_AUDIO) == -1) { + error("Could not initialize SDL: %s", SDL_GetError()); + } + + _mixer = new SdlMixerImpl(this); + } + + // Create and hook up the timer manager, if none exists yet (we check for + // this to allow subclasses to provide their own). + if (_timerManager == 0) { + _timerManager = new SdlTimerManager(); + } + + // Create and hook up the graphics manager, if none exists yet (we check for + // this to allow subclasses to provide their own). + if (_graphicsManager == 0) { + _graphicsManager = new SdlGraphicsManager(); + } + + if (_audiocdManager == 0) { + _audiocdManager = (AudioCDManager *)new SdlAudioCDManager(); + } + + // Invoke parent implementation of this method + OSystem::initBackend(); + + _inited = true; +} + +Common::String OSystem_POSIX::getDefaultConfigFileName() { + char configFile[MAXPATHLEN]; + + // On UNIX type systems, by default we store the config file inside + // to the HOME directory of the user. + // + // GP2X is Linux based but Home dir can be read only so do not use + // it and put the config in the executable dir. + // + // On the iPhone, the home dir of the user when you launch the app + // from the Springboard, is /. Which we don't want. + const char *home = getenv("HOME"); + if (home != NULL && strlen(home) < MAXPATHLEN) + snprintf(configFile, MAXPATHLEN, "%s/%s", home, DEFAULT_CONFIG_FILE); + else + strcpy(configFile, DEFAULT_CONFIG_FILE); + + return configFile; +} diff --git a/backends/platform/posix/posix.h b/backends/platform/posix/posix.h new file mode 100644 index 0000000000..5d8098b31c --- /dev/null +++ b/backends/platform/posix/posix.h @@ -0,0 +1,42 @@ +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + * $URL$ + * $Id$ + * + */ + +#ifndef PLATFORM_POSIX_H +#define PLATFORM_POSIX_H + +#include "backends/platform/sdl/sdl.h" + +class OSystem_POSIX : public OSystem_SDL { +public: + OSystem_POSIX(); + virtual ~OSystem_POSIX(); + + virtual void initBackend(); + +protected: + virtual Common::String getDefaultConfigFileName(); +}; + +#endif diff --git a/backends/platform/sdl/main.cpp b/backends/platform/sdl/main.cpp index 73e3dc36ae..75e535428a 100644 --- a/backends/platform/sdl/main.cpp +++ b/backends/platform/sdl/main.cpp @@ -27,7 +27,7 @@ // Several SDL based ports use a custom main, and hence do not want to compile // of this file. The following "#if" ensures that. -#if !defined(__MAEMO__) && !defined(_WIN32_WCE) && !defined(GP2XWIZ)&& !defined(LINUXMOTO) && !defined(__SYMBIAN32__) && !defined(WIN32) +#if !defined(__MAEMO__) && !defined(_WIN32_WCE) && !defined(GP2XWIZ)&& !defined(LINUXMOTO) && !defined(__SYMBIAN32__) && !defined(WIN32) && !defined(UNIX) #include "backends/platform/sdl/sdl.h" diff --git a/backends/platform/win32/win32.cpp b/backends/platform/win32/win32.cpp index 174e7fd181..59b960439a 100644 --- a/backends/platform/win32/win32.cpp +++ b/backends/platform/win32/win32.cpp @@ -40,8 +40,6 @@ #include "backends/mixer/sdl/sdl-mixer.h" #include "backends/timer/sdl/sdl-timer.h" -#include "icons/scummvm.xpm" - #include "backends/fs/windows/windows-fs-factory.h" #define DEFAULT_CONFIG_FILE "scummvm.ini" @@ -137,7 +137,7 @@ _enable_prof=no _vkeybd=no _keymapper=no # Default platform settings -_backend=sdl +_backend=posix _endian=unknown _need_memalign=no _have_x86=no @@ -625,8 +625,8 @@ Usage: $0 [OPTIONS]... Configuration: -h, --help display this help and exit --backend=BACKEND backend to build (dc, gp2x, gp2xwiz, iphone, - linuxmoto, nds, null, ps2, psp, sdl, wii, wince) - [sdl] + linuxmoto, nds, null, posix, ps2, psp, sdl, wii, wince) + [posix] Installation directories: --prefix=PREFIX install architecture-independent files in PREFIX @@ -1734,7 +1734,7 @@ fi # Enable 16bit support only for backends which support it # case $_backend in - dreamcast | samsungtv | sdl | wii | psp) + dreamcast | samsungtv | sdl | wii | psp | posix) if test "$_16bit" = auto ; then _16bit=yes else @@ -2413,6 +2413,13 @@ case $_backend in null) DEFINES="$DEFINES -DUSE_NULL_DRIVER" ;; + posix) + find_sdlconfig + INCLUDES="$INCLUDES `$_sdlconfig --prefix="$_sdlpath" --cflags`" + LIBS="$LIBS `$_sdlconfig --prefix="$_sdlpath" --libs`" + DEFINES="$DEFINES -DSDL_BACKEND" + MODULES="$MODULES backends/platform/sdl" + ;; ps2) # TODO ps2 DEFINES="$DEFINES -D_EE -DFORCE_RTL" |