[Scummvm-cvs-logs] SF.net SVN: scummvm:[50228] scummvm/branches/gsoc2010-opengl/backends/ platform/sdl
vgvgf at users.sourceforge.net
vgvgf at users.sourceforge.net
Thu Jun 24 21:06:01 CEST 2010
Revision: 50228
http://scummvm.svn.sourceforge.net/scummvm/?rev=50228&view=rev
Author: vgvgf
Date: 2010-06-24 19:05:59 +0000 (Thu, 24 Jun 2010)
Log Message:
-----------
Created macosx port from sdl backend.
Modified Paths:
--------------
scummvm/branches/gsoc2010-opengl/backends/platform/sdl/module.mk
scummvm/branches/gsoc2010-opengl/backends/platform/sdl/posix/posix.h
scummvm/branches/gsoc2010-opengl/backends/platform/sdl/win32/win32.h
Added Paths:
-----------
scummvm/branches/gsoc2010-opengl/backends/platform/sdl/macosx/
scummvm/branches/gsoc2010-opengl/backends/platform/sdl/macosx/macosx.cpp
scummvm/branches/gsoc2010-opengl/backends/platform/sdl/macosx/macosx.h
scummvm/branches/gsoc2010-opengl/backends/platform/sdl/macosx/main.cpp
Property changes on: scummvm/branches/gsoc2010-opengl/backends/platform/sdl/macosx
___________________________________________________________________
Added: svn:ignore
+ .deps
*.o
lib*.a
Added: scummvm/branches/gsoc2010-opengl/backends/platform/sdl/macosx/macosx.cpp
===================================================================
--- scummvm/branches/gsoc2010-opengl/backends/platform/sdl/macosx/macosx.cpp (rev 0)
+++ scummvm/branches/gsoc2010-opengl/backends/platform/sdl/macosx/macosx.cpp 2010-06-24 19:05:59 UTC (rev 50228)
@@ -0,0 +1,83 @@
+/* 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$
+ *
+ */
+
+#ifdef MACOSX
+
+#include "backends/platform/sdl/macosx/macosx.h"
+#include "backends/mixer/bufferingsdl/bufferingsdl-mixer.h"
+
+#include "CoreFoundation/CoreFoundation.h"
+
+#define DEFAULT_CONFIG_FILE "Library/Preferences/ScummVM Preferences"
+
+OSystem_MacOSX::OSystem_MacOSX() {
+}
+
+void OSystem_MacOSX::initBackend() {
+ // Create the mixer manager
+ if (_mixer == 0) {
+ _mixerManager = new BufferingSDLMixerManager();
+
+ // Setup and start mixer
+ _mixerManager->init();
+ }
+
+ // Invoke parent implementation of this method
+ OSystem_POSIX::initBackend();
+}
+
+Common::String OSystem_MacOSX::getDefaultConfigFileName() {
+ char configFile[MAXPATHLEN];
+
+ // On UNIX type systems, by default we store the config file inside
+ // to the HOME directory of the user.
+ 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;
+}
+
+void OSystem_MacOSX::addSysArchivesToSearchSet(Common::SearchSet &s, int priority) {
+ // Invoke parent implementation of this method
+ OSystem_POSIX::addSysArchivesToSearchSet(s, priority);
+
+ // Get URL of the Resource directory of the .app bundle
+ CFURLRef fileUrl = CFBundleCopyResourcesDirectoryURL(CFBundleGetMainBundle());
+ if (fileUrl) {
+ // Try to convert the URL to an absolute path
+ UInt8 buf[MAXPATHLEN];
+ if (CFURLGetFileSystemRepresentation(fileUrl, true, buf, sizeof(buf))) {
+ // Success: Add it to the search path
+ Common::String bundlePath((const char *)buf);
+ s.add("__OSX_BUNDLE__", new Common::FSDirectory(bundlePath), priority);
+ }
+ CFRelease(fileUrl);
+ }
+}
+
+#endif
Property changes on: scummvm/branches/gsoc2010-opengl/backends/platform/sdl/macosx/macosx.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/sdl/macosx/macosx.h
===================================================================
--- scummvm/branches/gsoc2010-opengl/backends/platform/sdl/macosx/macosx.h (rev 0)
+++ scummvm/branches/gsoc2010-opengl/backends/platform/sdl/macosx/macosx.h 2010-06-24 19:05:59 UTC (rev 50228)
@@ -0,0 +1,44 @@
+/* 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_SDL_MACOSX_H
+#define PLATFORM_SDL_MACOSX_H
+
+#include "backends/platform/sdl/posix/posix.h"
+
+class OSystem_MacOSX : public OSystem_POSIX {
+public:
+ OSystem_MacOSX();
+ ~OSystem_MacOSX() {}
+
+ void initBackend();
+
+ void addSysArchivesToSearchSet(Common::SearchSet &s, int priority = 0);
+
+protected:
+ Common::String getDefaultConfigFileName();
+};
+
+#endif
Property changes on: scummvm/branches/gsoc2010-opengl/backends/platform/sdl/macosx/macosx.h
___________________________________________________________________
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/sdl/macosx/main.cpp
===================================================================
--- scummvm/branches/gsoc2010-opengl/backends/platform/sdl/macosx/main.cpp (rev 0)
+++ scummvm/branches/gsoc2010-opengl/backends/platform/sdl/macosx/main.cpp 2010-06-24 19:05:59 UTC (rev 50228)
@@ -0,0 +1,56 @@
+/* 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$
+ *
+ */
+
+#ifdef MACOSX
+
+#include "common/scummsys.h"
+
+#include "backends/platform/sdl/macosx/macosx.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_MacOSX();
+ assert(g_system);
+
+ // Pre initialize the backend
+ ((OSystem_MacOSX *)g_system)->init();
+
+#ifdef DYNAMIC_MODULES
+ PluginManager::instance().addPluginProvider(new SDLPluginProvider());
+#endif
+
+ // Invoke the actual ScummVM main entry point:
+ int res = scummvm_main(argc, argv);
+
+ // Free OSystem
+ delete (OSystem_MacOSX *)g_system;
+
+ return res;
+}
+
+#endif
Property changes on: scummvm/branches/gsoc2010-opengl/backends/platform/sdl/macosx/main.cpp
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:keywords
+ Date Rev Author URL Id
Added: svn:eol-style
+ native
Modified: scummvm/branches/gsoc2010-opengl/backends/platform/sdl/module.mk
===================================================================
--- scummvm/branches/gsoc2010-opengl/backends/platform/sdl/module.mk 2010-06-24 18:48:50 UTC (rev 50227)
+++ scummvm/branches/gsoc2010-opengl/backends/platform/sdl/module.mk 2010-06-24 19:05:59 UTC (rev 50228)
@@ -1,6 +1,8 @@
MODULE := backends/platform/sdl
MODULE_OBJS := \
+ macosx/main.o \
+ macosx/macosx.o \
posix/main.o \
posix/posix.o \
win32/main.o \
Modified: scummvm/branches/gsoc2010-opengl/backends/platform/sdl/posix/posix.h
===================================================================
--- scummvm/branches/gsoc2010-opengl/backends/platform/sdl/posix/posix.h 2010-06-24 18:48:50 UTC (rev 50227)
+++ scummvm/branches/gsoc2010-opengl/backends/platform/sdl/posix/posix.h 2010-06-24 19:05:59 UTC (rev 50228)
@@ -23,8 +23,8 @@
*
*/
-#ifndef PLATFORM_POSIX_H
-#define PLATFORM_POSIX_H
+#ifndef PLATFORM_SDL_POSIX_H
+#define PLATFORM_SDL_POSIX_H
#include "backends/platform/sdl/sdl.h"
Modified: scummvm/branches/gsoc2010-opengl/backends/platform/sdl/win32/win32.h
===================================================================
--- scummvm/branches/gsoc2010-opengl/backends/platform/sdl/win32/win32.h 2010-06-24 18:48:50 UTC (rev 50227)
+++ scummvm/branches/gsoc2010-opengl/backends/platform/sdl/win32/win32.h 2010-06-24 19:05:59 UTC (rev 50228)
@@ -23,8 +23,8 @@
*
*/
-#ifndef PLATFORM_WIN32_H
-#define PLATFORM_WIN32_H
+#ifndef PLATFORM_SDL_WIN32_H
+#define PLATFORM_SDL_WIN32_H
#include "backends/platform/sdl/sdl.h"
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