[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Stratagus-CVS] stratagus contrib/msvc.zip contrib/stdint.h src...
|
From: |
Jimmy Salmon |
|
Subject: |
[Stratagus-CVS] stratagus contrib/msvc.zip contrib/stdint.h src... |
|
Date: |
Wed, 15 Oct 2003 21:36:26 -0400 |
CVSROOT: /cvsroot/stratagus
Module name: stratagus
Branch:
Changes by: Jimmy Salmon <address@hidden> 03/10/15 21:36:26
Modified files:
contrib : msvc.zip stdint.h
src/clone : clone.c pud.c
src/game : savegame.c
src/include : iocompat.h net_lowlevel.h stratagus.h
src/libmodplug : stdafx.h
src/network : commands.c
src/siod : slib.c slibu.c
src/sound : ogg.c
src/ui : menu_proc.c
src/video : Module.make
Removed files:
src/video : wince.c
Log message:
Removed wince support
Patches:
Index: stratagus/contrib/msvc.zip
Index: stratagus/contrib/stdint.h
diff -u stratagus/contrib/stdint.h:1.1 stratagus/contrib/stdint.h:1.2
--- stratagus/contrib/stdint.h:1.1 Sun May 26 02:07:23 2002
+++ stratagus/contrib/stdint.h Wed Oct 15 21:36:25 2003
@@ -27,7 +27,7 @@
typedef unsigned short uint16_t;
typedef int int32_t;
typedef unsigned uint32_t;
-#if defined(_MSC_VER) && !defined(_WIN32_WCE)
+#ifdef _MSC_VER
typedef LONGLONG int64_t;
typedef ULONGLONG uint64_t;
#else
@@ -43,7 +43,7 @@
typedef unsigned short uint_least16_t;
typedef int int_least32_t;
typedef unsigned uint_least32_t;
-#if defined(_MSC_VER) && !defined(_WIN32_WCE)
+#ifdef _MSC_VER
typedef LONGLONG int_least64_t;
typedef ULONGLONG uint_least64_t;
#else
@@ -61,7 +61,7 @@
typedef unsigned short uint_fast16_t;
typedef int int_fast32_t;
typedef unsigned int uint_fast32_t;
-#if defined(_MSC_VER) && !defined(_WIN32_WCE)
+#ifdef _MSC_VER
typedef LONGLONG int_fast64_t;
typedef ULONGLONG uint_fast64_t;
#else
@@ -74,7 +74,7 @@
typedef unsigned uintptr_t;
/* 7.18.1.5 Greatest-width integer types */
-#if defined(_MSC_VER) && !defined(_WIN32_WCE)
+#ifdef _MSC_VER
typedef LONGLONG intmax_t;
typedef ULONGLONG uintmax_t;
#else
Index: stratagus/src/clone/clone.c
diff -u stratagus/src/clone/clone.c:1.212 stratagus/src/clone/clone.c:1.213
--- stratagus/src/clone/clone.c:1.212 Wed Oct 15 20:06:37 2003
+++ stratagus/src/clone/clone.c Wed Oct 15 21:36:25 2003
@@ -26,7 +26,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
//
-// $Id: clone.c,v 1.212 2003/10/16 00:06:37 jsalmon3 Exp $
+// $Id: clone.c,v 1.213 2003/10/16 01:36:25 jsalmon3 Exp $
//@{
@@ -182,16 +182,14 @@
#ifndef _MSC_VER
#include <unistd.h>
#endif
-#if defined(__CYGWIN__)
+#ifdef __CYGWIN__
#include <getopt.h>
#endif
-#if defined(_MSC_VER)
+#ifdef _MSC_VER
//#include "etlib/getopt.h"
extern char* optarg;
extern int optind;
-#ifndef _WIN32_WCE
extern int getopt(int argc, char *const*argv, const char *opt);
-#endif
#endif
#ifdef USE_SDL
Index: stratagus/src/clone/pud.c
diff -u stratagus/src/clone/pud.c:1.110 stratagus/src/clone/pud.c:1.111
--- stratagus/src/clone/pud.c:1.110 Mon Sep 29 22:53:01 2003
+++ stratagus/src/clone/pud.c Wed Oct 15 21:36:25 2003
@@ -26,7 +26,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
//
-// $Id: pud.c,v 1.110 2003/09/30 02:53:01 jsalmon3 Exp $
+// $Id: pud.c,v 1.111 2003/10/16 01:36:25 jsalmon3 Exp $
//@{
@@ -43,7 +43,7 @@
#ifdef BSD
#include <inttypes.h>
#else
-#if defined(_MSC_VER) && !defined(_WIN32_WCE)
+#ifdef _MSC_VER
#define DrawIcon WinDrawIcon
#define EndMenu WinEndMenu
#include <winsock2.h>
Index: stratagus/src/game/savegame.c
diff -u stratagus/src/game/savegame.c:1.33 stratagus/src/game/savegame.c:1.34
--- stratagus/src/game/savegame.c:1.33 Fri Sep 26 22:13:06 2003
+++ stratagus/src/game/savegame.c Wed Oct 15 21:36:25 2003
@@ -26,7 +26,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
//
-// $Id: savegame.c,v 1.33 2003/09/27 02:13:06 jsalmon3 Exp $
+// $Id: savegame.c,v 1.34 2003/10/16 01:36:25 jsalmon3 Exp $
//@{
@@ -36,9 +36,7 @@
#include <string.h>
#include <stdio.h>
-#if !defined(_MSC_VER) || !defined(_WIN32_WCE)
#include <time.h>
-#endif
#include "stratagus.h"
@@ -103,7 +101,7 @@
CLprintf(file, ";;;(save-game\n");
CLprintf(file, ";;; 'comment\t\"Generated by Stratagus Version " VERSION
"\"\n");
CLprintf(file, ";;; 'comment\t\"Visit http://Stratagus.Org for more
informations\"\n");
- CLprintf(file, ";;; 'comment\t\"$Id: savegame.c,v 1.33 2003/09/27
02:13:06 jsalmon3 Exp $\"\n");
+ CLprintf(file, ";;; 'comment\t\"$Id: savegame.c,v 1.34 2003/10/16
01:36:25 jsalmon3 Exp $\"\n");
CLprintf(file, ";;; 'type\t\"%s\"\n", "single-player");
CLprintf(file, ";;; 'date\t\"%s\"\n", s);
CLprintf(file, ";;; 'map\t\"%s\"\n", TheMap.Description);
Index: stratagus/src/include/iocompat.h
diff -u stratagus/src/include/iocompat.h:1.8
stratagus/src/include/iocompat.h:1.9
--- stratagus/src/include/iocompat.h:1.8 Fri Jul 11 10:35:30 2003
+++ stratagus/src/include/iocompat.h Wed Oct 15 21:36:25 2003
@@ -26,7 +26,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
//
-// $Id: iocompat.h,v 1.8 2003/07/11 14:35:30 n0body Exp $
+// $Id: iocompat.h,v 1.9 2003/10/16 01:36:25 jsalmon3 Exp $
#ifndef __IOCOMPAT_H__
#define __IOCOMPAT_H__
@@ -49,9 +49,6 @@
#else // _MSC_VER
-#ifdef _WIN32_WCE
-#define R_OK 1 // FIXME: correct?
-#else
#define R_OK 4
#define F_OK 0
#include <sys/types.h>
@@ -64,7 +61,6 @@
#define PATH_MAX _MAX_PATH
#define S_ISDIR(x) ((x) & _S_IFDIR)
#define S_ISREG(x) ((x) & _S_IFREG)
-#endif
#endif // _MSC_VER
Index: stratagus/src/include/net_lowlevel.h
diff -u stratagus/src/include/net_lowlevel.h:1.30
stratagus/src/include/net_lowlevel.h:1.31
--- stratagus/src/include/net_lowlevel.h:1.30 Thu Oct 2 19:31:01 2003
+++ stratagus/src/include/net_lowlevel.h Wed Oct 15 21:36:25 2003
@@ -26,7 +26,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
//
-// $Id: net_lowlevel.h,v 1.30 2003/10/02 23:31:01 jsalmon3 Exp $
+// $Id: net_lowlevel.h,v 1.31 2003/10/16 01:36:25 jsalmon3 Exp $
#ifndef __NET_LOWLEVEL_H
#define __NET_LOWLEVEL_H
@@ -50,15 +50,6 @@
#if defined(__WIN32__) || defined(WIN32) || defined(_WIN32)
#define USE_WINSOCK
-
-#if !defined(_MSC_VER) || defined(_WIN32_WCE)
-#ifndef _WIN32_WINNT
-#define _WIN32_WINNT 0x0400
-#endif
-#ifndef WINVER
-#define WINVER 0x0400
-#endif
-#endif
#ifdef __MINGW32__
#define DrawIcon WinDrawIcon
Index: stratagus/src/include/stratagus.h
diff -u stratagus/src/include/stratagus.h:1.19
stratagus/src/include/stratagus.h:1.20
--- stratagus/src/include/stratagus.h:1.19 Wed Oct 15 20:06:37 2003
+++ stratagus/src/include/stratagus.h Wed Oct 15 21:36:25 2003
@@ -26,7 +26,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
//
-// $Id: stratagus.h,v 1.19 2003/10/16 00:06:37 jsalmon3 Exp $
+// $Id: stratagus.h,v 1.20 2003/10/16 01:36:25 jsalmon3 Exp $
#ifndef __STRATAGUS_H__
#define __STRATAGUS_H__
@@ -134,7 +134,6 @@
#define inline __inline /// Fix m$ brain damage
#define alloca _alloca /// I hope this works with all VC..
-#ifndef _WIN32_WCE
#pragma warning(disable:4244) // Conversion from double to uchar
#pragma warning(disable:4761) // Integral size mismatch
#define snprintf _snprintf /// Unix -> dumm
@@ -142,7 +141,6 @@
#include <string.h>
#define strdup _strdup
#define strncasecmp strnicmp
-#endif
#ifndef __FUNCTION__
@@ -512,13 +510,6 @@
/*============================================================================
== Misc
============================================================================*/
-
-#if !defined(_MSC_VER) || defined(_WIN32_WCE)
-#ifndef max
- /// max macro
-#define max(n1,n2) (((n1)<(n2)) ? (n2) : (n1))
-#endif
-#endif
/// bits macro
#define BitsOf(n) (sizeof(n)*8)
Index: stratagus/src/libmodplug/stdafx.h
diff -u stratagus/src/libmodplug/stdafx.h:1.19
stratagus/src/libmodplug/stdafx.h:1.20
--- stratagus/src/libmodplug/stdafx.h:1.19 Thu Jul 3 12:35:43 2003
+++ stratagus/src/libmodplug/stdafx.h Wed Oct 15 21:36:25 2003
@@ -5,7 +5,7 @@
* Olivier Lapicque <address@hidden>,
* Adam Goode <address@hidden> (endian and char fixes for PPC)
*
- * $Id: stdafx.h,v 1.19 2003/07/03 16:35:43 ingo Exp $
+ * $Id: stdafx.h,v 1.20 2003/10/16 01:36:25 jsalmon3 Exp $
*/
@@ -47,9 +47,7 @@
#if defined(_MSC_VER) // || defined(__MINGW32__) // {
-#ifndef _WIN32_WCE
#include "stratagus.h"
-#endif
#ifndef __MINGW32__
#pragma warning (disable:4201)
Index: stratagus/src/network/commands.c
diff -u stratagus/src/network/commands.c:1.68
stratagus/src/network/commands.c:1.69
--- stratagus/src/network/commands.c:1.68 Thu Oct 2 00:07:37 2003
+++ stratagus/src/network/commands.c Wed Oct 15 21:36:25 2003
@@ -26,7 +26,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
//
-// $Id: commands.c,v 1.68 2003/10/02 04:07:37 jsalmon3 Exp $
+// $Id: commands.c,v 1.69 2003/10/16 01:36:25 jsalmon3 Exp $
//@{
@@ -37,9 +37,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#if !defined(_MSC_VER) || !defined(_WIN32_WCE)
#include <time.h>
-#endif
#include "stratagus.h"
#include "unit.h"
@@ -145,7 +143,7 @@
fprintf(LogFile, "(replay-log\n");
fprintf(LogFile, " 'comment\t\"Generated by Stratagus Version "
VERSION "\"\n");
fprintf(LogFile, " 'comment\t\"Visit http://Stratagus.Org for more
information\"\n");
- fprintf(LogFile, " 'comment\t\"$Id: commands.c,v 1.68 2003/10/02
04:07:37 jsalmon3 Exp $\"\n");
+ fprintf(LogFile, " 'comment\t\"$Id: commands.c,v 1.69 2003/10/16
01:36:25 jsalmon3 Exp $\"\n");
if (NetworkFildes == (Socket)-1) {
fprintf(LogFile, " 'type\t\"%s\"\n", "single-player");
fprintf(LogFile, " 'race\t%d\n", GameSettings.Presets[0].Race);
Index: stratagus/src/siod/slib.c
diff -u stratagus/src/siod/slib.c:1.30 stratagus/src/siod/slib.c:1.31
--- stratagus/src/siod/slib.c:1.30 Mon Sep 29 17:38:17 2003
+++ stratagus/src/siod/slib.c Wed Oct 15 21:36:25 2003
@@ -74,12 +74,9 @@
#include <math.h>
#include <stdlib.h>
#include <assert.h>
-
-#if !defined(_MSC_VER) || !defined(_WIN32_WCE)
#include <signal.h>
#include <time.h>
#include <errno.h>
-#endif
#include "siod.h"
#include "siodp.h"
@@ -94,7 +91,7 @@
static void init_slib_version(void)
{setvar(cintern("*slib-version*"),
- cintern("$Id: slib.c,v 1.30 2003/09/29 21:38:17 jsalmon3 Exp $"),
+ cintern("$Id: slib.c,v 1.31 2003/10/16 01:36:25 jsalmon3 Exp $"),
NIL);}
char * __stdcall siod_version(void)
@@ -2463,11 +2460,7 @@
((strlen(siod_lib) + strlen(fname) + 1)
< sizeof(buffer)))
{strcpy(buffer,siod_lib);
-#if defined(unix) || defined(__APPLE__) || defined(__MINGW32__)
strcat(buffer,"/");
-#elif defined(_MSC_VER) && !defined(_WIN32_WCE)
- strcat(buffer,"\\");
-#endif
strcat(buffer,fname);
if ((f = fopen(buffer,"r")))
{fname = buffer;
Index: stratagus/src/siod/slibu.c
diff -u stratagus/src/siod/slibu.c:1.20 stratagus/src/siod/slibu.c:1.21
--- stratagus/src/siod/slibu.c:1.20 Wed Apr 9 19:38:14 2003
+++ stratagus/src/siod/slibu.c Wed Oct 15 21:36:25 2003
@@ -16,12 +16,9 @@
#include <math.h>
#include <stdlib.h>
#include <stdarg.h>
-
-#if !defined(_MSC_VER) || !defined(_WIN32_WCE)
#include <signal.h>
#include <time.h>
#include <errno.h>
-#endif
#if defined(unix) || defined(__APPLE__)
#include <unistd.h>
@@ -119,7 +116,7 @@
static void init_slibu_version(void)
{setvar(cintern("*slibu-version*"),
- cintern("$Id: slibu.c,v 1.20 2003/04/09 23:38:14 mr-russ Exp $"),
+ cintern("$Id: slibu.c,v 1.21 2003/10/16 01:36:25 jsalmon3 Exp $"),
NIL);}
@@ -2318,7 +2315,7 @@
init_subr_1("readdir",l_readdir);
#endif
// init_subr_1("delete-file",delete_file);
-#if !defined(_WIN32_WCE)
+#ifndef _WIN32_WCE
init_subr_1("file-times",file_times);
init_subr_1("unix-time->strtime",utime2str);
#endif
@@ -2362,7 +2359,7 @@
init_subr_3("lchown",siod_lchown);
#endif
#endif // SIOD_ALLFNS
-#if !defined(_WIN32_WCE)
+#ifndef _WIN32_WCE
init_subr_1("http-date",http_date);
#endif
#if defined(__osf__)
Index: stratagus/src/sound/ogg.c
diff -u stratagus/src/sound/ogg.c:1.33 stratagus/src/sound/ogg.c:1.34
--- stratagus/src/sound/ogg.c:1.33 Wed Oct 1 20:12:54 2003
+++ stratagus/src/sound/ogg.c Wed Oct 15 21:36:25 2003
@@ -26,7 +26,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
//
-// $Id: ogg.c,v 1.33 2003/10/02 00:12:54 jsalmon3 Exp $
+// $Id: ogg.c,v 1.34 2003/10/16 01:36:25 jsalmon3 Exp $
//@{
@@ -44,9 +44,7 @@
#ifdef BSD
#include <inttypes.h>
#else
-#if defined(_MSC_VER) && !defined(_WIN32_WCE)
#include <windows.h>
-#endif
#include <stdint.h>
#endif // BSD
Index: stratagus/src/ui/menu_proc.c
diff -u stratagus/src/ui/menu_proc.c:1.105 stratagus/src/ui/menu_proc.c:1.106
--- stratagus/src/ui/menu_proc.c:1.105 Tue Oct 7 20:06:43 2003
+++ stratagus/src/ui/menu_proc.c Wed Oct 15 21:36:26 2003
@@ -26,7 +26,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
//
-// $Id: menu_proc.c,v 1.105 2003/10/08 00:06:43 jsalmon3 Exp $
+// $Id: menu_proc.c,v 1.106 2003/10/16 01:36:26 jsalmon3 Exp $
//@{
@@ -40,7 +40,7 @@
#include "stratagus.h"
-#if defined(_MSC_VER)
+#ifdef _MSC_VER
#undef NOUSER
#endif
#include "video.h"
Index: stratagus/src/video/Module.make
diff -u stratagus/src/video/Module.make:1.2 stratagus/src/video/Module.make:1.3
--- stratagus/src/video/Module.make:1.2 Wed Oct 15 20:06:37 2003
+++ stratagus/src/video/Module.make Wed Oct 15 21:36:26 2003
@@ -1,4 +1,4 @@
-SRC += src/video/X11.c src/video/cursor.c src/video/deco.c src/video/font.c
src/video/graphic.c src/video/linedraw.c src/video/new_X11.c src/video/png.c
src/video/sdl.c src/video/sprite.c src/video/sweepline.c src/video/video.c
src/video/wince.c
+SRC += src/video/X11.c src/video/cursor.c src/video/deco.c src/video/font.c
src/video/graphic.c src/video/linedraw.c src/video/new_X11.c src/video/png.c
src/video/sdl.c src/video/sprite.c src/video/sweepline.c src/video/video.c
HDRS += src/video/intern_video.h src/video/sweepline.h
-OBJ += src/video/$(OBJDIR)/X11.o src/video/$(OBJDIR)/cursor.o
src/video/$(OBJDIR)/deco.o src/video/$(OBJDIR)/font.o
src/video/$(OBJDIR)/graphic.o src/video/$(OBJDIR)/linedraw.o
src/video/$(OBJDIR)/new_X11.o src/video/$(OBJDIR)/png.o
src/video/$(OBJDIR)/sdl.o src/video/$(OBJDIR)/sprite.o
src/video/$(OBJDIR)/sweepline.o src/video/$(OBJDIR)/video.o
src/video/$(OBJDIR)/wince.o
+OBJ += src/video/$(OBJDIR)/X11.o src/video/$(OBJDIR)/cursor.o
src/video/$(OBJDIR)/deco.o src/video/$(OBJDIR)/font.o
src/video/$(OBJDIR)/graphic.o src/video/$(OBJDIR)/linedraw.o
src/video/$(OBJDIR)/new_X11.o src/video/$(OBJDIR)/png.o
src/video/$(OBJDIR)/sdl.o src/video/$(OBJDIR)/sprite.o
src/video/$(OBJDIR)/sweepline.o src/video/$(OBJDIR)/video.o
MISC += src/video/_clip_rectangle
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Stratagus-CVS] stratagus contrib/msvc.zip contrib/stdint.h src...,
Jimmy Salmon <=