[Scummvm-cvs-logs] SF.net SVN: scummvm: [24266] scummvm/trunk/backends/platform/wince
knakos at users.sourceforge.net
knakos at users.sourceforge.net
Tue Oct 10 17:15:06 CEST 2006
Revision: 24266
http://svn.sourceforge.net/scummvm/?rev=24266&view=rev
Author: knakos
Date: 2006-10-10 08:15:00 -0700 (Tue, 10 Oct 2006)
Log Message:
-----------
Merge ozone header
Modified Paths:
--------------
scummvm/trunk/backends/platform/wince/wince-sdl.cpp
scummvm/trunk/backends/platform/wince/wince-sdl.h
Removed Paths:
-------------
scummvm/trunk/backends/platform/wince/ozone.h
Deleted: scummvm/trunk/backends/platform/wince/ozone.h
===================================================================
--- scummvm/trunk/backends/platform/wince/ozone.h 2006-10-10 13:08:27 UTC (rev 24265)
+++ scummvm/trunk/backends/platform/wince/ozone.h 2006-10-10 15:15:00 UTC (rev 24266)
@@ -1,40 +0,0 @@
-/* ScummVM - Scumm Interpreter
- * Copyright (C) 2001-2006 The ScummVM project
- *
- * 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$
- *
- */
-
-#define GETRAWFRAMEBUFFER 0x00020001
-
-#define FORMAT_565 1
-#define FORMAT_555 2
-#define FORMAT_OTHER 3
-
-#if defined(_WIN32_WCE) && _WIN32_WCE <= 300
-typedef struct _RawFrameBufferInfo
-{
- WORD wFormat;
- WORD wBPP;
- VOID *pFramePointer;
- int cxStride;
- int cyStride;
- int cxPixels;
- int cyPixels;
-} RawFrameBufferInfo;
-#endif
Modified: scummvm/trunk/backends/platform/wince/wince-sdl.cpp
===================================================================
--- scummvm/trunk/backends/platform/wince/wince-sdl.cpp 2006-10-10 13:08:27 UTC (rev 24265)
+++ scummvm/trunk/backends/platform/wince/wince-sdl.cpp 2006-10-10 15:15:00 UTC (rev 24266)
@@ -45,7 +45,6 @@
#include "sound/fmopl.h"
-#include "ozone.h"
#include "CEException.h"
#ifdef USE_VORBIS
Modified: scummvm/trunk/backends/platform/wince/wince-sdl.h
===================================================================
--- scummvm/trunk/backends/platform/wince/wince-sdl.h 2006-10-10 13:08:27 UTC (rev 24265)
+++ scummvm/trunk/backends/platform/wince/wince-sdl.h 2006-10-10 15:15:00 UTC (rev 24266)
@@ -37,10 +37,26 @@
#include <SDL.h>
+#define TOTAL_ZONES 3
+// defines used for implementing the raw frame buffer access method (2003+)
+#define GETRAWFRAMEBUFFER 0x00020001
+#define FORMAT_565 1
+#define FORMAT_555 2
+#define FORMAT_OTHER 3
+#if defined(_WIN32_WCE) && _WIN32_WCE <= 300
+typedef struct _RawFrameBufferInfo
+{
+ WORD wFormat;
+ WORD wBPP;
+ VOID *pFramePointer;
+ int cxStride;
+ int cyStride;
+ int cxPixels;
+ int cyPixels;
+} RawFrameBufferInfo;
+#endif
-#define TOTAL_ZONES 3
-
class OSystem_WINCE3 : public OSystem_SDL {
public:
OSystem_WINCE3();
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