[Scummvm-cvs-logs] SF.net SVN: scummvm:[50103] scummvm/branches/gsoc2010-opengl
vgvgf at users.sourceforge.net
vgvgf at users.sourceforge.net
Mon Jun 21 00:45:09 CEST 2010
Revision: 50103
http://scummvm.svn.sourceforge.net/scummvm/?rev=50103&view=rev
Author: vgvgf
Date: 2010-06-20 22:45:09 +0000 (Sun, 20 Jun 2010)
Log Message:
-----------
Created win32 port from sdl backend.
Modified Paths:
--------------
scummvm/branches/gsoc2010-opengl/backends/platform/sdl/main.cpp
scummvm/branches/gsoc2010-opengl/backends/platform/sdl/sdl.cpp
scummvm/branches/gsoc2010-opengl/backends/platform/sdl/sdl.h
scummvm/branches/gsoc2010-opengl/tools/create_msvc/create_msvc.cpp
Added Paths:
-----------
scummvm/branches/gsoc2010-opengl/backends/platform/win32/
scummvm/branches/gsoc2010-opengl/backends/platform/win32/main.cpp
scummvm/branches/gsoc2010-opengl/backends/platform/win32/module.mk
scummvm/branches/gsoc2010-opengl/backends/platform/win32/win32.cpp
scummvm/branches/gsoc2010-opengl/backends/platform/win32/win32.h
Modified: scummvm/branches/gsoc2010-opengl/backends/platform/sdl/main.cpp
===================================================================
--- scummvm/branches/gsoc2010-opengl/backends/platform/sdl/main.cpp 2010-06-20 22:30:20 UTC (rev 50102)
+++ scummvm/branches/gsoc2010-opengl/backends/platform/sdl/main.cpp 2010-06-20 22:45:09 UTC (rev 50103)
@@ -23,34 +23,17 @@
*
*/
-// 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.
-#if defined(WIN32) && !defined(__SYMBIAN32__)
-#include <windows.h>
-// winnt.h defines ARRAYSIZE, but we want our own one...
-#undef ARRAYSIZE
-#endif
-
#include "common/scummsys.h"
// 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__)
+#if !defined(__MAEMO__) && !defined(_WIN32_WCE) && !defined(GP2XWIZ)&& !defined(LINUXMOTO) && !defined(__SYMBIAN32__) && !defined(WIN32)
#include "backends/platform/sdl/sdl.h"
#include "backends/plugins/sdl/sdl-provider.h"
#include "base/main.h"
-#ifdef WIN32
-int __stdcall WinMain(HINSTANCE /*hInst*/, HINSTANCE /*hPrevInst*/, LPSTR /*lpCmdLine*/, int /*iShowCmd*/) {
- SDL_SetModuleHandle(GetModuleHandle(NULL));
- return main(__argc, __argv);
-}
-#endif
-
int main(int argc, char *argv[]) {
// Create our OSystem instance
Modified: scummvm/branches/gsoc2010-opengl/backends/platform/sdl/sdl.cpp
===================================================================
--- scummvm/branches/gsoc2010-opengl/backends/platform/sdl/sdl.cpp 2010-06-20 22:30:20 UTC (rev 50102)
+++ scummvm/branches/gsoc2010-opengl/backends/platform/sdl/sdl.cpp 2010-06-20 22:45:09 UTC (rev 50103)
@@ -203,7 +203,7 @@
}
-static Common::String getDefaultConfigFileName() {
+Common::String OSystem_SDL::getDefaultConfigFileName() {
char configFile[MAXPATHLEN];
#if defined (WIN32) && !defined(_WIN32_WCE) && !defined(__SYMBIAN32__)
OSVERSIONINFO win32OsVersion;
@@ -320,9 +320,7 @@
void OSystem_SDL::quit() {
deinit();
-#if !defined(SAMSUNGTV)
exit(0);
-#endif
}
void OSystem_SDL::setupIcon() {
Modified: scummvm/branches/gsoc2010-opengl/backends/platform/sdl/sdl.h
===================================================================
--- scummvm/branches/gsoc2010-opengl/backends/platform/sdl/sdl.h 2010-06-20 22:30:20 UTC (rev 50102)
+++ scummvm/branches/gsoc2010-opengl/backends/platform/sdl/sdl.h 2010-06-20 22:45:09 UTC (rev 50103)
@@ -48,7 +48,7 @@
// Quit
virtual void quit(); // overloaded by CE backend
- void deinit();
+ virtual void deinit();
virtual void setWindowCaption(const char *caption);
@@ -60,14 +60,16 @@
virtual bool pollEvent(Common::Event &event);
- uint32 getMillis();
- void delayMillis(uint msecs);
- void getTimeAndDate(TimeDate &td) const;
+ virtual uint32 getMillis();
+ virtual void delayMillis(uint msecs);
+ virtual void getTimeAndDate(TimeDate &td) const;
protected:
bool _inited;
void setupIcon();
+
+ virtual Common::String getDefaultConfigFileName();
};
#endif
Property changes on: scummvm/branches/gsoc2010-opengl/backends/platform/win32
___________________________________________________________________
Added: svn:ignore
+ .deps
*.o
lib*.a
Added: scummvm/branches/gsoc2010-opengl/backends/platform/win32/main.cpp
===================================================================
--- scummvm/branches/gsoc2010-opengl/backends/platform/win32/main.cpp (rev 0)
+++ scummvm/branches/gsoc2010-opengl/backends/platform/win32/main.cpp 2010-06-20 22:45:09 UTC (rev 50103)
@@ -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 <windows.h>
+// 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;
+}
Property changes on: scummvm/branches/gsoc2010-opengl/backends/platform/win32/main.cpp
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:keywords
+ Date Rev Author URL Id
Added: svn:eol-style
+ native
Added: scummvm/branches/gsoc2010-opengl/backends/platform/win32/module.mk
===================================================================
--- scummvm/branches/gsoc2010-opengl/backends/platform/win32/module.mk (rev 0)
+++ scummvm/branches/gsoc2010-opengl/backends/platform/win32/module.mk 2010-06-20 22:45:09 UTC (rev 50103)
@@ -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
Property changes on: scummvm/branches/gsoc2010-opengl/backends/platform/win32/module.mk
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:keywords
+ Date Rev Author URL Id
Added: svn:eol-style
+ native
Added: scummvm/branches/gsoc2010-opengl/backends/platform/win32/win32.cpp
===================================================================
--- scummvm/branches/gsoc2010-opengl/backends/platform/win32/win32.cpp (rev 0)
+++ scummvm/branches/gsoc2010-opengl/backends/platform/win32/win32.cpp 2010-06-20 22:45:09 UTC (rev 50103)
@@ -0,0 +1,167 @@
+/* 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 <windows.h>
+// 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 "icons/scummvm.xpm"
+
+#include "backends/fs/windows/windows-fs-factory.h"
+
+#define DEFAULT_CONFIG_FILE "scummvm.ini"
+
+OSystem_Win32::OSystem_Win32() {
+ _fsFactory = new WindowsFilesystemFactory();
+}
+
+void OSystem_Win32::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 DefaultSaveFileManager();
+ }
+
+ // 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();
+ }
+
+ // Setup a custom program icon.
+ setupIcon();
+
+ // Invoke parent implementation of this method
+ OSystem::initBackend();
+
+ _inited = true;
+}
+
+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;
+}
Property changes on: scummvm/branches/gsoc2010-opengl/backends/platform/win32/win32.cpp
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:keywords
+ Date Rev Author URL Id
Added: svn:eol-style
+ native
Added: scummvm/branches/gsoc2010-opengl/backends/platform/win32/win32.h
===================================================================
--- scummvm/branches/gsoc2010-opengl/backends/platform/win32/win32.h (rev 0)
+++ scummvm/branches/gsoc2010-opengl/backends/platform/win32/win32.h 2010-06-20 22:45:09 UTC (rev 50103)
@@ -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_WIN32_H
+#define PLATFORM_WIN32_H
+
+#include "backends/platform/sdl/sdl.h"
+
+class OSystem_Win32 : public OSystem_SDL {
+public:
+ OSystem_Win32();
+ ~OSystem_Win32() {}
+
+ void initBackend();
+
+protected:
+ Common::String getDefaultConfigFileName();
+};
+
+#endif
Property changes on: scummvm/branches/gsoc2010-opengl/backends/platform/win32/win32.h
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:keywords
+ Date Rev Author URL Id
Added: svn:eol-style
+ native
Modified: scummvm/branches/gsoc2010-opengl/tools/create_msvc/create_msvc.cpp
===================================================================
--- scummvm/branches/gsoc2010-opengl/tools/create_msvc/create_msvc.cpp 2010-06-20 22:30:20 UTC (rev 50102)
+++ scummvm/branches/gsoc2010-opengl/tools/create_msvc/create_msvc.cpp 2010-06-20 22:45:09 UTC (rev 50103)
@@ -990,6 +990,7 @@
// File list for the ScummVM project file
createModuleList(setup.srcDir + "/backends", setup.defines, in, ex);
createModuleList(setup.srcDir + "/backends/platform/sdl", setup.defines, in, ex);
+ createModuleList(setup.srcDir + "/backends/platform/win32", setup.defines, in, ex);
createModuleList(setup.srcDir + "/base", setup.defines, in, ex);
createModuleList(setup.srcDir + "/common", setup.defines, in, ex);
createModuleList(setup.srcDir + "/engines", setup.defines, in, ex);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list