From 0fb9d3ccfa3c2f0ddaa9019702a0039c96112c34 Mon Sep 17 00:00:00 2001 From: Alejandro Marzini Date: Wed, 23 Jun 2010 20:55:36 +0000 Subject: Relocated Win32 and Posix ports. (Part 1) svn-id: r50191 --- backends/platform/posix/main.cpp | 46 --------------- backends/platform/posix/module.mk | 11 ---- backends/platform/posix/posix.cpp | 76 ------------------------ backends/platform/posix/posix.h | 42 ------------- backends/platform/sdl/posix/main.cpp | 46 +++++++++++++++ backends/platform/sdl/posix/module.mk | 11 ++++ backends/platform/sdl/posix/posix.cpp | 76 ++++++++++++++++++++++++ backends/platform/sdl/posix/posix.h | 42 +++++++++++++ backends/platform/sdl/win32/main.cpp | 59 +++++++++++++++++++ backends/platform/sdl/win32/module.mk | 11 ++++ backends/platform/sdl/win32/win32.cpp | 98 +++++++++++++++++++++++++++++++ backends/platform/sdl/win32/win32.h | 40 +++++++++++++ backends/platform/symbian/src/SymbianOS.h | 19 +----- backends/platform/win32/main.cpp | 59 ------------------- backends/platform/win32/module.mk | 11 ---- backends/platform/win32/win32.cpp | 98 ------------------------------- backends/platform/win32/win32.h | 40 ------------- 17 files changed, 385 insertions(+), 400 deletions(-) delete mode 100644 backends/platform/posix/main.cpp delete mode 100644 backends/platform/posix/module.mk delete mode 100644 backends/platform/posix/posix.cpp delete mode 100644 backends/platform/posix/posix.h create mode 100644 backends/platform/sdl/posix/main.cpp create mode 100644 backends/platform/sdl/posix/module.mk create mode 100644 backends/platform/sdl/posix/posix.cpp create mode 100644 backends/platform/sdl/posix/posix.h create mode 100644 backends/platform/sdl/win32/main.cpp create mode 100644 backends/platform/sdl/win32/module.mk create mode 100644 backends/platform/sdl/win32/win32.cpp create mode 100644 backends/platform/sdl/win32/win32.h delete mode 100644 backends/platform/win32/main.cpp delete mode 100644 backends/platform/win32/module.mk delete mode 100644 backends/platform/win32/win32.cpp delete mode 100644 backends/platform/win32/win32.h diff --git a/backends/platform/posix/main.cpp b/backends/platform/posix/main.cpp deleted file mode 100644 index 35813291c1..0000000000 --- a/backends/platform/posix/main.cpp +++ /dev/null @@ -1,46 +0,0 @@ -/* 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 deleted file mode 100644 index b1827c7578..0000000000 --- a/backends/platform/posix/module.mk +++ /dev/null @@ -1,11 +0,0 @@ -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 deleted file mode 100644 index 61871c7f82..0000000000 --- a/backends/platform/posix/posix.cpp +++ /dev/null @@ -1,76 +0,0 @@ -/* 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() { - // Initialze File System Factory - _fsFactory = new POSIXFilesystemFactory(); -} - -void OSystem_POSIX::initBackend() { - // Create the savefile manager - if (_savefileManager == 0) - _savefileManager = new POSIXSaveFileManager(); - - // Invoke parent implementation of this method - OSystem_SDL::initBackend(); -} - -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 deleted file mode 100644 index 5d8098b31c..0000000000 --- a/backends/platform/posix/posix.h +++ /dev/null @@ -1,42 +0,0 @@ -/* 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/posix/main.cpp b/backends/platform/sdl/posix/main.cpp new file mode 100644 index 0000000000..35813291c1 --- /dev/null +++ b/backends/platform/sdl/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/sdl/posix/module.mk b/backends/platform/sdl/posix/module.mk new file mode 100644 index 0000000000..b1827c7578 --- /dev/null +++ b/backends/platform/sdl/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/sdl/posix/posix.cpp b/backends/platform/sdl/posix/posix.cpp new file mode 100644 index 0000000000..61871c7f82 --- /dev/null +++ b/backends/platform/sdl/posix/posix.cpp @@ -0,0 +1,76 @@ +/* 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() { + // Initialze File System Factory + _fsFactory = new POSIXFilesystemFactory(); +} + +void OSystem_POSIX::initBackend() { + // Create the savefile manager + if (_savefileManager == 0) + _savefileManager = new POSIXSaveFileManager(); + + // Invoke parent implementation of this method + OSystem_SDL::initBackend(); +} + +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/sdl/posix/posix.h b/backends/platform/sdl/posix/posix.h new file mode 100644 index 0000000000..5d8098b31c --- /dev/null +++ b/backends/platform/sdl/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/win32/main.cpp b/backends/platform/sdl/win32/main.cpp new file mode 100644 index 0000000000..803d2e1475 --- /dev/null +++ b/backends/platform/sdl/win32/main.cpp @@ -0,0 +1,59 @@ +/* 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$ + * + */ + +// Fix for bug #2895217 "MSVC compilation broken with r47595": +// We need to keep this on top of the "common/scummsys.h" include, +// otherwise we will get errors about the windows headers redefining +// "ARRAYSIZE" for example. +#include +// winnt.h defines ARRAYSIZE, but we want our own one... +#undef ARRAYSIZE + +#include "common/scummsys.h" + +#include "backends/platform/win32/win32.h" +#include "backends/plugins/sdl/sdl-provider.h" +#include "base/main.h" + +int __stdcall WinMain(HINSTANCE /*hInst*/, HINSTANCE /*hPrevInst*/, LPSTR /*lpCmdLine*/, int /*iShowCmd*/) { + SDL_SetModuleHandle(GetModuleHandle(NULL)); + return main(__argc, __argv); +} + +int main(int argc, char *argv[]) { + + // Create our OSystem instance + g_system = new OSystem_Win32(); + 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_Win32 *)g_system; + return res; +} diff --git a/backends/platform/sdl/win32/module.mk b/backends/platform/sdl/win32/module.mk new file mode 100644 index 0000000000..a10aa6c717 --- /dev/null +++ b/backends/platform/sdl/win32/module.mk @@ -0,0 +1,11 @@ +MODULE := backends/platform/win32 + +MODULE_OBJS := \ + main.o \ + win32.o + +MODULE_DIRS += \ + backends/platform/win32/ + +# We don't use the rules.mk here on purpose +OBJS := $(addprefix $(MODULE)/, $(MODULE_OBJS)) $(OBJS) \ No newline at end of file diff --git a/backends/platform/sdl/win32/win32.cpp b/backends/platform/sdl/win32/win32.cpp new file mode 100644 index 0000000000..2e039a6059 --- /dev/null +++ b/backends/platform/sdl/win32/win32.cpp @@ -0,0 +1,98 @@ +/* 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 +// winnt.h defines ARRAYSIZE, but we want our own one... - this is needed before including util.h +#undef ARRAYSIZE + +#include "backends/platform/win32/win32.h" +#include "common/archive.h" +#include "common/config-manager.h" +#include "common/debug.h" +#include "common/util.h" + +#include "backends/saves/default/default-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/windows/windows-fs-factory.h" + +#define DEFAULT_CONFIG_FILE "scummvm.ini" + +OSystem_Win32::OSystem_Win32() { + // Initialze File System Factory + _fsFactory = new WindowsFilesystemFactory(); +} + +Common::String OSystem_Win32::getDefaultConfigFileName() { + char configFile[MAXPATHLEN]; + + OSVERSIONINFO win32OsVersion; + ZeroMemory(&win32OsVersion, sizeof(OSVERSIONINFO)); + win32OsVersion.dwOSVersionInfoSize = sizeof(OSVERSIONINFO); + GetVersionEx(&win32OsVersion); + // Check for non-9X version of Windows. + if (win32OsVersion.dwPlatformId != VER_PLATFORM_WIN32_WINDOWS) { + // Use the Application Data directory of the user profile. + if (win32OsVersion.dwMajorVersion >= 5) { + if (!GetEnvironmentVariable("APPDATA", configFile, sizeof(configFile))) + error("Unable to access application data directory"); + } else { + if (!GetEnvironmentVariable("USERPROFILE", configFile, sizeof(configFile))) + error("Unable to access user profile directory"); + + strcat(configFile, "\\Application Data"); + CreateDirectory(configFile, NULL); + } + + strcat(configFile, "\\ScummVM"); + CreateDirectory(configFile, NULL); + strcat(configFile, "\\" DEFAULT_CONFIG_FILE); + + FILE *tmp = NULL; + if ((tmp = fopen(configFile, "r")) == NULL) { + // Check windows directory + char oldConfigFile[MAXPATHLEN]; + GetWindowsDirectory(oldConfigFile, MAXPATHLEN); + strcat(oldConfigFile, "\\" DEFAULT_CONFIG_FILE); + if ((tmp = fopen(oldConfigFile, "r"))) { + strcpy(configFile, oldConfigFile); + + fclose(tmp); + } + } else { + fclose(tmp); + } + } else { + // Check windows directory + GetWindowsDirectory(configFile, MAXPATHLEN); + strcat(configFile, "\\" DEFAULT_CONFIG_FILE); + } + + return configFile; +} diff --git a/backends/platform/sdl/win32/win32.h b/backends/platform/sdl/win32/win32.h new file mode 100644 index 0000000000..2bcb0c59b3 --- /dev/null +++ b/backends/platform/sdl/win32/win32.h @@ -0,0 +1,40 @@ +/* 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_WIN32_H +#define PLATFORM_WIN32_H + +#include "backends/platform/sdl/sdl.h" + +class OSystem_Win32 : public OSystem_SDL { +public: + OSystem_Win32(); + ~OSystem_Win32() {} + +protected: + Common::String getDefaultConfigFileName(); +}; + +#endif diff --git a/backends/platform/symbian/src/SymbianOS.h b/backends/platform/symbian/src/SymbianOS.h index 42929f8029..00b8ec12f2 100644 --- a/backends/platform/symbian/src/SymbianOS.h +++ b/backends/platform/symbian/src/SymbianOS.h @@ -42,35 +42,20 @@ public: */ virtual void initBackend(); - int getDefaultGraphicsMode() const; - const OSystem::GraphicsMode *getSupportedGraphicsModes() const; - bool setGraphicsMode(const char *name); void quitWithErrorMsg(const char *msg); + virtual bool hasFeature(Feature f); void setFeatureState(Feature f, bool enable); - // Set function that generates samples - // - // This function is overridden by the symbian port in order to provide MONO audio - // downmix is done by supplying our own audiocallback - // - virtual void setupMixer(); // overloaded by CE backend - // Overloaded from SDL_Commmon void quit(); // Returns reference to File session RFs& FsSession(); -protected: - // - // The mixer callback function. - // - static void symbianMixCallback(void *s, byte *samples, int len); - virtual Common::SeekableReadStream *createConfigReadStream(); virtual Common::WriteStream *createConfigWriteStream(); -public: + // vibration support #ifdef USE_VIBRA_SE_PXXX // diff --git a/backends/platform/win32/main.cpp b/backends/platform/win32/main.cpp deleted file mode 100644 index 803d2e1475..0000000000 --- a/backends/platform/win32/main.cpp +++ /dev/null @@ -1,59 +0,0 @@ -/* 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$ - * - */ - -// Fix for bug #2895217 "MSVC compilation broken with r47595": -// We need to keep this on top of the "common/scummsys.h" include, -// otherwise we will get errors about the windows headers redefining -// "ARRAYSIZE" for example. -#include -// winnt.h defines ARRAYSIZE, but we want our own one... -#undef ARRAYSIZE - -#include "common/scummsys.h" - -#include "backends/platform/win32/win32.h" -#include "backends/plugins/sdl/sdl-provider.h" -#include "base/main.h" - -int __stdcall WinMain(HINSTANCE /*hInst*/, HINSTANCE /*hPrevInst*/, LPSTR /*lpCmdLine*/, int /*iShowCmd*/) { - SDL_SetModuleHandle(GetModuleHandle(NULL)); - return main(__argc, __argv); -} - -int main(int argc, char *argv[]) { - - // Create our OSystem instance - g_system = new OSystem_Win32(); - 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_Win32 *)g_system; - return res; -} diff --git a/backends/platform/win32/module.mk b/backends/platform/win32/module.mk deleted file mode 100644 index a10aa6c717..0000000000 --- a/backends/platform/win32/module.mk +++ /dev/null @@ -1,11 +0,0 @@ -MODULE := backends/platform/win32 - -MODULE_OBJS := \ - main.o \ - win32.o - -MODULE_DIRS += \ - backends/platform/win32/ - -# We don't use the rules.mk here on purpose -OBJS := $(addprefix $(MODULE)/, $(MODULE_OBJS)) $(OBJS) \ No newline at end of file diff --git a/backends/platform/win32/win32.cpp b/backends/platform/win32/win32.cpp deleted file mode 100644 index 2e039a6059..0000000000 --- a/backends/platform/win32/win32.cpp +++ /dev/null @@ -1,98 +0,0 @@ -/* 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 -// winnt.h defines ARRAYSIZE, but we want our own one... - this is needed before including util.h -#undef ARRAYSIZE - -#include "backends/platform/win32/win32.h" -#include "common/archive.h" -#include "common/config-manager.h" -#include "common/debug.h" -#include "common/util.h" - -#include "backends/saves/default/default-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/windows/windows-fs-factory.h" - -#define DEFAULT_CONFIG_FILE "scummvm.ini" - -OSystem_Win32::OSystem_Win32() { - // Initialze File System Factory - _fsFactory = new WindowsFilesystemFactory(); -} - -Common::String OSystem_Win32::getDefaultConfigFileName() { - char configFile[MAXPATHLEN]; - - OSVERSIONINFO win32OsVersion; - ZeroMemory(&win32OsVersion, sizeof(OSVERSIONINFO)); - win32OsVersion.dwOSVersionInfoSize = sizeof(OSVERSIONINFO); - GetVersionEx(&win32OsVersion); - // Check for non-9X version of Windows. - if (win32OsVersion.dwPlatformId != VER_PLATFORM_WIN32_WINDOWS) { - // Use the Application Data directory of the user profile. - if (win32OsVersion.dwMajorVersion >= 5) { - if (!GetEnvironmentVariable("APPDATA", configFile, sizeof(configFile))) - error("Unable to access application data directory"); - } else { - if (!GetEnvironmentVariable("USERPROFILE", configFile, sizeof(configFile))) - error("Unable to access user profile directory"); - - strcat(configFile, "\\Application Data"); - CreateDirectory(configFile, NULL); - } - - strcat(configFile, "\\ScummVM"); - CreateDirectory(configFile, NULL); - strcat(configFile, "\\" DEFAULT_CONFIG_FILE); - - FILE *tmp = NULL; - if ((tmp = fopen(configFile, "r")) == NULL) { - // Check windows directory - char oldConfigFile[MAXPATHLEN]; - GetWindowsDirectory(oldConfigFile, MAXPATHLEN); - strcat(oldConfigFile, "\\" DEFAULT_CONFIG_FILE); - if ((tmp = fopen(oldConfigFile, "r"))) { - strcpy(configFile, oldConfigFile); - - fclose(tmp); - } - } else { - fclose(tmp); - } - } else { - // Check windows directory - GetWindowsDirectory(configFile, MAXPATHLEN); - strcat(configFile, "\\" DEFAULT_CONFIG_FILE); - } - - return configFile; -} diff --git a/backends/platform/win32/win32.h b/backends/platform/win32/win32.h deleted file mode 100644 index 2bcb0c59b3..0000000000 --- a/backends/platform/win32/win32.h +++ /dev/null @@ -1,40 +0,0 @@ -/* 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_WIN32_H -#define PLATFORM_WIN32_H - -#include "backends/platform/sdl/sdl.h" - -class OSystem_Win32 : public OSystem_SDL { -public: - OSystem_Win32(); - ~OSystem_Win32() {} - -protected: - Common::String getDefaultConfigFileName(); -}; - -#endif -- cgit v1.2.3