[Scummvm-cvs-logs] SF.net SVN: scummvm:[50255] scummvm/branches/gsoc2010-opengl/backends/ platform/sdl
vgvgf at users.sourceforge.net
vgvgf at users.sourceforge.net
Fri Jun 25 02:02:58 CEST 2010
Revision: 50255
http://scummvm.svn.sourceforge.net/scummvm/?rev=50255&view=rev
Author: vgvgf
Date: 2010-06-25 00:02:58 +0000 (Fri, 25 Jun 2010)
Log Message:
-----------
Fix link error with duplicated name files.
Modified Paths:
--------------
scummvm/branches/gsoc2010-opengl/backends/platform/sdl/module.mk
Added Paths:
-----------
scummvm/branches/gsoc2010-opengl/backends/platform/sdl/macosx/macosx-main.cpp
scummvm/branches/gsoc2010-opengl/backends/platform/sdl/posix/posix-main.cpp
scummvm/branches/gsoc2010-opengl/backends/platform/sdl/win32/win32-main.cpp
Removed Paths:
-------------
scummvm/branches/gsoc2010-opengl/backends/platform/sdl/macosx/main.cpp
scummvm/branches/gsoc2010-opengl/backends/platform/sdl/posix/main.cpp
scummvm/branches/gsoc2010-opengl/backends/platform/sdl/win32/main.cpp
Copied: scummvm/branches/gsoc2010-opengl/backends/platform/sdl/macosx/macosx-main.cpp (from rev 50254, scummvm/branches/gsoc2010-opengl/backends/platform/sdl/macosx/main.cpp)
===================================================================
--- scummvm/branches/gsoc2010-opengl/backends/platform/sdl/macosx/macosx-main.cpp (rev 0)
+++ scummvm/branches/gsoc2010-opengl/backends/platform/sdl/macosx/macosx-main.cpp 2010-06-25 00:02:58 UTC (rev 50255)
@@ -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
Deleted: scummvm/branches/gsoc2010-opengl/backends/platform/sdl/macosx/main.cpp
===================================================================
--- scummvm/branches/gsoc2010-opengl/backends/platform/sdl/macosx/main.cpp 2010-06-24 23:51:02 UTC (rev 50254)
+++ scummvm/branches/gsoc2010-opengl/backends/platform/sdl/macosx/main.cpp 2010-06-25 00:02:58 UTC (rev 50255)
@@ -1,56 +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$
- *
- */
-
-#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
Modified: scummvm/branches/gsoc2010-opengl/backends/platform/sdl/module.mk
===================================================================
--- scummvm/branches/gsoc2010-opengl/backends/platform/sdl/module.mk 2010-06-24 23:51:02 UTC (rev 50254)
+++ scummvm/branches/gsoc2010-opengl/backends/platform/sdl/module.mk 2010-06-25 00:02:58 UTC (rev 50255)
@@ -1,11 +1,11 @@
MODULE := backends/platform/sdl
MODULE_OBJS := \
- macosx/main.o \
+ macosx/macosx-main.o \
macosx/macosx.o \
- posix/main.o \
+ posix/posix-main.o \
posix/posix.o \
- win32/main.o \
+ win32/win32-main.o \
win32/win32.o \
hardwarekeys.o \
main.o \
Deleted: scummvm/branches/gsoc2010-opengl/backends/platform/sdl/posix/main.cpp
===================================================================
--- scummvm/branches/gsoc2010-opengl/backends/platform/sdl/posix/main.cpp 2010-06-24 23:51:02 UTC (rev 50254)
+++ scummvm/branches/gsoc2010-opengl/backends/platform/sdl/posix/main.cpp 2010-06-25 00:02:58 UTC (rev 50255)
@@ -1,56 +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$
- *
- */
-
-#ifdef UNIX
-
-#include "common/scummsys.h"
-
-#include "backends/platform/sdl/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);
-
- // Pre initialize the backend
- ((OSystem_POSIX *)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_POSIX *)g_system;
-
- return res;
-}
-
-#endif
Copied: scummvm/branches/gsoc2010-opengl/backends/platform/sdl/posix/posix-main.cpp (from rev 50254, scummvm/branches/gsoc2010-opengl/backends/platform/sdl/posix/main.cpp)
===================================================================
--- scummvm/branches/gsoc2010-opengl/backends/platform/sdl/posix/posix-main.cpp (rev 0)
+++ scummvm/branches/gsoc2010-opengl/backends/platform/sdl/posix/posix-main.cpp 2010-06-25 00:02:58 UTC (rev 50255)
@@ -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 UNIX
+
+#include "common/scummsys.h"
+
+#include "backends/platform/sdl/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);
+
+ // Pre initialize the backend
+ ((OSystem_POSIX *)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_POSIX *)g_system;
+
+ return res;
+}
+
+#endif
Deleted: scummvm/branches/gsoc2010-opengl/backends/platform/sdl/win32/main.cpp
===================================================================
--- scummvm/branches/gsoc2010-opengl/backends/platform/sdl/win32/main.cpp 2010-06-24 23:51:02 UTC (rev 50254)
+++ scummvm/branches/gsoc2010-opengl/backends/platform/sdl/win32/main.cpp 2010-06-25 00:02:58 UTC (rev 50255)
@@ -1,69 +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$
- *
- */
-
-#ifdef WIN32
-
-// 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/sdl/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);
-
- // Pre initialize the backend
- ((OSystem_Win32 *)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_Win32 *)g_system;
-
- return res;
-}
-
-#endif
Copied: scummvm/branches/gsoc2010-opengl/backends/platform/sdl/win32/win32-main.cpp (from rev 50254, scummvm/branches/gsoc2010-opengl/backends/platform/sdl/win32/main.cpp)
===================================================================
--- scummvm/branches/gsoc2010-opengl/backends/platform/sdl/win32/win32-main.cpp (rev 0)
+++ scummvm/branches/gsoc2010-opengl/backends/platform/sdl/win32/win32-main.cpp 2010-06-25 00:02:58 UTC (rev 50255)
@@ -0,0 +1,69 @@
+/* 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 WIN32
+
+// 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/sdl/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);
+
+ // Pre initialize the backend
+ ((OSystem_Win32 *)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_Win32 *)g_system;
+
+ return res;
+}
+
+#endif
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