[Scummvm-cvs-logs] SF.net SVN: scummvm:[52303] scummvm/branches/gsoc2010-opengl

vgvgf at users.sourceforge.net vgvgf at users.sourceforge.net
Mon Aug 23 20:37:17 CEST 2010 

Revision: 52303
          http://scummvm.svn.sourceforge.net/scummvm/?rev=52303&view=rev
Author:   vgvgf
Date:     2010-08-23 18:37:17 +0000 (Mon, 23 Aug 2010)

Log Message:
-----------
AMIGAOS: Fix build.

Modified Paths:
--------------
    scummvm/branches/gsoc2010-opengl/backends/platform/sdl/module.mk
    scummvm/branches/gsoc2010-opengl/configure

Added Paths:
-----------
    scummvm/branches/gsoc2010-opengl/backends/platform/sdl/amigaos/
    scummvm/branches/gsoc2010-opengl/backends/platform/sdl/amigaos/amigaos-main.cpp
    scummvm/branches/gsoc2010-opengl/backends/platform/sdl/amigaos/amigaos.cpp
    scummvm/branches/gsoc2010-opengl/backends/platform/sdl/amigaos/amigaos.h


Property changes on: scummvm/branches/gsoc2010-opengl/backends/platform/sdl/amigaos
___________________________________________________________________
Added: svn:ignore
   + .deps
*.o
lib*.a


Added: scummvm/branches/gsoc2010-opengl/backends/platform/sdl/amigaos/amigaos-main.cpp
===================================================================
--- scummvm/branches/gsoc2010-opengl/backends/platform/sdl/amigaos/amigaos-main.cpp	                        (rev 0)
+++ scummvm/branches/gsoc2010-opengl/backends/platform/sdl/amigaos/amigaos-main.cpp	2010-08-23 18:37:17 UTC (rev 52303)
@@ -0,0 +1,54 @@
+/* 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$
+ *
+ */
+
+#if defined(__amigaos4__)
+
+#include "backends/platform/sdl/amigaos/amigaos.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_AmigaOS();
+	assert(g_system);
+
+	// Pre initialize the backend
+	((OSystem_AmigaOS *)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_AmigaOS *)g_system;
+
+	return res;
+}
+
+#endif


Property changes on: scummvm/branches/gsoc2010-opengl/backends/platform/sdl/amigaos/amigaos-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/sdl/amigaos/amigaos.cpp
===================================================================
--- scummvm/branches/gsoc2010-opengl/backends/platform/sdl/amigaos/amigaos.cpp	                        (rev 0)
+++ scummvm/branches/gsoc2010-opengl/backends/platform/sdl/amigaos/amigaos.cpp	2010-08-23 18:37:17 UTC (rev 52303)
@@ -0,0 +1,39 @@
+/* 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 __amigaos4__
+
+#include "backends/platform/sdl/amigaos/amigaos.h"
+#include "backends/fs/amigaos4/amigaos4-fs-factory.h"
+
+void OSystem_AmigaOS::init() {
+	// Initialze File System Factory
+	_fsFactory = new AmigaOSFilesystemFactory();
+
+	// Invoke parent implementation of this method
+	OSystem_SDL::init();
+}
+
+#endif


Property changes on: scummvm/branches/gsoc2010-opengl/backends/platform/sdl/amigaos/amigaos.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/amigaos/amigaos.h
===================================================================
--- scummvm/branches/gsoc2010-opengl/backends/platform/sdl/amigaos/amigaos.h	                        (rev 0)
+++ scummvm/branches/gsoc2010-opengl/backends/platform/sdl/amigaos/amigaos.h	2010-08-23 18:37:17 UTC (rev 52303)
@@ -0,0 +1,39 @@
+/* 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_AMIGAOS_H
+#define PLATFORM_SDL_AMIGAOS_H
+
+#include "backends/platform/sdl/sdl.h"
+
+class OSystem_AmigaOS : public OSystem_SDL {
+public:
+	OSystem_AmigaOS() {}
+	virtual ~OSystem_AmigaOS() {}
+
+	virtual void init();
+};
+
+#endif


Property changes on: scummvm/branches/gsoc2010-opengl/backends/platform/sdl/amigaos/amigaos.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/backends/platform/sdl/module.mk
===================================================================
--- scummvm/branches/gsoc2010-opengl/backends/platform/sdl/module.mk	2010-08-23 17:01:33 UTC (rev 52302)
+++ scummvm/branches/gsoc2010-opengl/backends/platform/sdl/module.mk	2010-08-23 18:37:17 UTC (rev 52303)
@@ -19,6 +19,11 @@
 	win32/win32.o
 endif
 
+ifdef AMIGAOS
+	amigaos/amigaos-main.o \
+	amigaos/amigaos.o
+endif
+
 # We don't use the rules.mk here on purpose
 MODULE_OBJS := $(addprefix $(MODULE)/, $(MODULE_OBJS))
 OBJS := $(MODULE_OBJS) $(OBJS)

Modified: scummvm/branches/gsoc2010-opengl/configure
===================================================================
--- scummvm/branches/gsoc2010-opengl/configure	2010-08-23 17:01:33 UTC (rev 52302)
+++ scummvm/branches/gsoc2010-opengl/configure	2010-08-23 18:37:17 UTC (rev 52303)
@@ -1371,6 +1371,7 @@
 		# We have to use 'long' for our 4 byte typedef because AmigaOS already typedefs (u)int32
 		# as (unsigned) long, and consequently we'd get a compiler error otherwise.
 		type_4_byte='long'
+		add_line_to_config_mk 'AMIGAOS = 1'
 		;;
 	android)
 		CXXFLAGS="$CXXFLAGS -Os -msoft-float -mtune=xscale -march=armv5te -D__ARM_ARCH_5__ -D__ARM_ARCH_5T__ -D__ARM_ARCH_5TE__"


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