Ticket #7903: scummvm_cygwin_patch

File scummvm_cygwin_patch, 1.2 KB (added by SF/maloi, 22 years ago)

scummvm cygwin patch

Line 
1diff -Naur old/Makefile new/Makefile
2--- old/Makefile Fri Oct 12 18:18:38 2001
3+++ new/Makefile Thu Nov 8 23:26:43 2001
4@@ -24,7 +24,7 @@
5 all: scummvm
6
7 scummvm: $(OBJS)
8- $(CC) $(LDFLAGS) -o $(@) $(OBJS) $(LIBS)
9+ $(CC) $(OBJS) $(LDFLAGS) -o $(@) $(LIBS)
10
11 clean:
12 rm -f $(OBJS) scummvm
13diff -Naur old/scummsys.h new/scummsys.h
14--- old/scummsys.h Wed Oct 10 04:35:02 2001
15+++ new/scummsys.h Tue Nov 6 00:57:43 2001
16@@ -38,7 +38,12 @@
17
18 #define SCUMM_LITTLE_ENDIAN
19
20+#if defined __CYGWIN__
21+#define FORCEINLINE inline
22+#else
23 #define FORCEINLINE __forceinline
24+#endif
25+
26 #define NORETURN _declspec(noreturn)
27
28 typedef unsigned char byte;
29diff -Naur old/scummvm.cpp new/scummvm.cpp
30--- old/scummvm.cpp Thu Oct 11 21:54:38 2001
31+++ new/scummvm.cpp Thu Nov 8 18:03:43 2001
32@@ -38,6 +38,10 @@
33 *
34 */
35
36+#ifdef __CYGWIN__
37+#include <ctype.h>
38+#endif
39+
40 #include "stdafx.h"
41 #include "scumm.h"
42
43@@ -396,7 +400,7 @@
44
45 static const GameNameList game_list[] = {
46 {"monkey1", "Monkey Island 1"},
47- {"monkedy2", "Monkey Island 2: LeChuck's revenge"},
48+ {"monkey2", "Monkey Island 2: LeChuck's revenge"},
49 {"atlantis", "Indiana Jones 4 and the Fate of Atlantis"},
50 {"fate", "Indiana Jones 4 and the Fate of Atlantis (Demo)"},
51 {NULL,NULL}