[Scummvm-cvs-logs] CVS: scummvm/backends/wince PocketSCUMM.rc,1.5,1.6 newres.h,1.2,1.3 portdefs.h,1.3,1.4
Nicolas Bacca
arisme at users.sourceforge.net
Fri Apr 4 05:15:11 CEST 2003
Update of /cvsroot/scummvm/scummvm/backends/wince
In directory sc8-pr-cvs1:/tmp/cvs-serv15688
Modified Files:
PocketSCUMM.rc newres.h portdefs.h
Log Message:
Fix compiling issues with Smartphone/HPC builds
Index: PocketSCUMM.rc
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/wince/PocketSCUMM.rc,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- PocketSCUMM.rc 26 Jan 2003 21:46:11 -0000 1.5
+++ PocketSCUMM.rc 4 Apr 2003 13:14:14 -0000 1.6
@@ -1,135 +1,142 @@
-//Microsoft Developer Studio generated resource script.
-//
-#include "resource.h"
-
-#define APSTUDIO_READONLY_SYMBOLS
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 2 resource.
-//
-#include "newres.h"
-
-/////////////////////////////////////////////////////////////////////////////
-#undef APSTUDIO_READONLY_SYMBOLS
-
-/////////////////////////////////////////////////////////////////////////////
-// French (France) resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_FRA)
-#ifdef _WIN32
-LANGUAGE LANG_FRENCH, SUBLANG_FRENCH
-#pragma code_page(1252)
-#endif //_WIN32
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Icon
-//
-
-// Icon with lowest ID value placed first to ensure application icon
-// remains consistent on all systems.
-IDI_POCKETSCUMM ICON DISCARDABLE "scumm_icon.ico"
-
-#ifdef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// TEXTINCLUDE
-//
-
-1 TEXTINCLUDE DISCARDABLE
-BEGIN
- "resource.h\0"
-END
-
-2 TEXTINCLUDE DISCARDABLE
-BEGIN
- "#include ""newres.h""\r\n"
- "\0"
-END
-
-3 TEXTINCLUDE DISCARDABLE
-BEGIN
- "\r\n"
- "\0"
-END
-
-#endif // APSTUDIO_INVOKED
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Menubar
-//
-
-IDR_SMARTFON_MENUBAR_GAMES MENU DISCARDABLE
-BEGIN
- POPUP "Games"
- BEGIN
- POPUP "Play"
- BEGIN
- MENUITEM SEPARATOR
- END
- MENUITEM SEPARATOR
- MENUITEM "Scan", IDM_SMARTFON_SCAN
- MENUITEM SEPARATOR
- MENUITEM "Quit", IDM_SMARTFON_QUIT
- END
- POPUP "Options"
- BEGIN
- POPUP "Keys Mapping"
- BEGIN
- MENUITEM SEPARATOR
- END
- MENUITEM "Music", IDM_SMARTFON_MUSIC
- END
-END
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Data
-//
-
-IDR_SMARTFON_MENUBAR_GAMES SHMENUBAR DISCARDABLE
-BEGIN
- IDR_SMARTFON_MENUBAR_GAMES, 2,
- I_IMAGENONE, ID_MENU_GAMES, TBSTATE_ENABLED,
- TBSTYLE_DROPDOWN | TBSTYLE_AUTOSIZE, IDS_CAP_MENUITEM40002, 0, 0,
- I_IMAGENONE, ID_MENU_OPTIONS, TBSTATE_ENABLED,
- TBSTYLE_DROPDOWN | TBSTYLE_AUTOSIZE, IDS_CAP_OPTIONS, 0, 1,
-END
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Bitmap
-//
-
-IDB_LOGO BITMAP DISCARDABLE "logo.bmp"
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// String Table
-//
-
-STRINGTABLE DISCARDABLE
-BEGIN
- IDS_CAP_MENUITEM40002 "Games"
- IDS_CAP_OPTIONS "Options"
-END
-
-#endif // French (France) resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-
-#ifndef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 3 resource.
-//
-
-
-/////////////////////////////////////////////////////////////////////////////
-#endif // not APSTUDIO_INVOKED
-
+//Microsoft Developer Studio generated resource script.
+//
+#include "resource.h"
+
+#define APSTUDIO_READONLY_SYMBOLS
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 2 resource.
+//
+
+#include "newres.h"
+
+/////////////////////////////////////////////////////////////////////////////
+#undef APSTUDIO_READONLY_SYMBOLS
+
+/////////////////////////////////////////////////////////////////////////////
+// French (France) resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_FRA)
+#ifdef _WIN32
+LANGUAGE LANG_FRENCH, SUBLANG_FRENCH
+#pragma code_page(1252)
+#endif //_WIN32
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Icon
+//
+
+// Icon with lowest ID value placed first to ensure application icon
+// remains consistent on all systems.
+IDI_POCKETSCUMM ICON DISCARDABLE "scumm_icon.ico"
+
+#ifdef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// TEXTINCLUDE
+//
+
+1 TEXTINCLUDE DISCARDABLE
+BEGIN
+ "resource.h\0"
+END
+
+#if _WIN32_WCE >= 300
+
+2 TEXTINCLUDE DISCARDABLE
+BEGIN
+ "#include ""newres.h""\r\n"
+ "\0"
+END
+
+#endif
+
+3 TEXTINCLUDE DISCARDABLE
+BEGIN
+ "\r\n"
+ "\0"
+END
+
+#endif // APSTUDIO_INVOKED
+
+#if _WIN32_WCE >= 300
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Menubar
+//
+
+IDR_SMARTFON_MENUBAR_GAMES MENU DISCARDABLE
+BEGIN
+ POPUP "Games"
+ BEGIN
+ POPUP "Play"
+ BEGIN
+ MENUITEM SEPARATOR
+ END
+ MENUITEM SEPARATOR
+ MENUITEM "Scan", IDM_SMARTFON_SCAN
+ MENUITEM SEPARATOR
+ MENUITEM "Quit", IDM_SMARTFON_QUIT
+ END
+ POPUP "Options"
+ BEGIN
+ POPUP "Keys Mapping"
+ BEGIN
+ MENUITEM SEPARATOR
+ END
+ MENUITEM "Music", IDM_SMARTFON_MUSIC
+ END
+END
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Data
+//
+
+IDR_SMARTFON_MENUBAR_GAMES SHMENUBAR DISCARDABLE
+BEGIN
+ IDR_SMARTFON_MENUBAR_GAMES, 2,
+ I_IMAGENONE, ID_MENU_GAMES, TBSTATE_ENABLED,
+ TBSTYLE_DROPDOWN | TBSTYLE_AUTOSIZE, IDS_CAP_MENUITEM40002, 0, 0,
+ I_IMAGENONE, ID_MENU_OPTIONS, TBSTATE_ENABLED,
+ TBSTYLE_DROPDOWN | TBSTYLE_AUTOSIZE, IDS_CAP_OPTIONS, 0, 1,
+END
+
+#endif
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Bitmap
+//
+
+IDB_LOGO BITMAP DISCARDABLE "logo.bmp"
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// String Table
+//
+
+STRINGTABLE DISCARDABLE
+BEGIN
+ IDS_CAP_MENUITEM40002 "Games"
+ IDS_CAP_OPTIONS "Options"
+END
+
+#endif // French (France) resources
+/////////////////////////////////////////////////////////////////////////////
+
+
+
+#ifndef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 3 resource.
+//
+
+
+/////////////////////////////////////////////////////////////////////////////
+#endif // not APSTUDIO_INVOKED
+
Index: newres.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/wince/newres.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- newres.h 26 Jan 2003 21:46:12 -0000 1.2
+++ newres.h 4 Apr 2003 13:14:15 -0000 1.3
@@ -41,7 +41,9 @@
#ifndef _INC_WINDOWS
#define _INC_WINDOWS
#include "winuser.h" // extract from windows header
+#if _WIN32_WCE >= 300
#include "winver.h"
+#endif
#endif
#endif
Index: portdefs.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/wince/portdefs.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- portdefs.h 20 Jan 2003 07:59:43 -0000 1.3
+++ portdefs.h 4 Apr 2003 13:14:15 -0000 1.4
@@ -23,10 +23,12 @@
#if _WIN32_WCE < 300
+#define _HEAPOK 0
+
void *calloc(size_t n, size_t s);
int isdigit(int c);
-int isprint(int c);
-int isspace(int c);
+int isprint(int c);
+int isspace(int c);
char *strrchr(const char *s, int c);
char *strdup(const char *s);
int _stricmp( const char *string1, const char *string2 );
@@ -35,4 +37,29 @@
void assert( int expression );
long int strtol(const char *nptr, char **endptr, int base);
char *strdup( const char *s);
+int _heapchk();
+
+#endif
+
+#ifdef _WIN32_WCE
+
+void *bsearch(const void *, const void *, size_t,
+ size_t, int (*x) (const void *, const void *));
+#include <windows.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <io.h>
+#include <stdarg.h>
+#include <fcntl.h>
+#include <conio.h>
+#include <malloc.h>
+#include <assert.h>
+#include <mmsystem.h>
+#include <ctype.h>
+#include <Winuser.h>
+#include <direct.h>
+
+void drawError(char*);
+
#endif
More information about the Scummvm-git-logs
mailing list