- fix braindamaged code

Changed files:
    scummvm-gcc34.patch -> 1.1
    scummvm-makefile.patch -> 1.2

diff --git a/scummvm-gcc34.patch b/scummvm-gcc34.patch
new file mode 100644 (file)
index 0000000..442d5e9
--- /dev/null
+++ b/scummvm-gcc34.patch
@@ -0,0 +1,53 @@
+diff -ruN scummvm-0.6.0./scumm/actor.cpp scummvm-0.6.0/scumm/actor.cpp
+--- scummvm-0.6.0./scumm/actor.cpp     2004-02-25 05:37:28.000000000 +0100
++++ scummvm-0.6.0/scumm/actor.cpp      2004-03-16 16:25:09.866004528 +0100
+@@ -789,14 +789,14 @@
+               return _V1_talkingActor;
+       else
+               return VAR(VAR_TALK_ACTOR);
+-};
++}
+ 
+ void ScummEngine::talkingActor(int value) {
+       if (_gameId == GID_MANIAC && _version == 1)
+               _V1_talkingActor = value;
+       else
+               VAR(VAR_TALK_ACTOR) = value;
+-};
++}
+ 
+ void ScummEngine::showActors() {
+       int i;
+diff -ruN scummvm-0.6.0./scumm/debugger.cpp scummvm-0.6.0/scumm/debugger.cpp
+--- scummvm-0.6.0./scumm/debugger.cpp  2004-02-13 11:26:40.000000000 +0100
++++ scummvm-0.6.0/scumm/debugger.cpp   2004-03-16 16:25:30.984793984 +0100
+@@ -57,7 +57,7 @@
+       va_end(va);
+ 
+       debug(buf);
+-};
++}
+       
+ ScummDebugger::ScummDebugger(ScummEngine *s)
+       : Common::Debugger<ScummDebugger>() {
+@@ -592,7 +592,7 @@
+ 
+       DebugPrintf("Unknown flag. Type 'Debug ?' for syntax\n");
+       return true;
+-};
++}
+ 
+ bool ScummDebugger::Cmd_DebugLevel(int argc, const char **argv) {
+       if (argc == 1) {
+diff -ruN scummvm-0.6.0./base/main.cpp scummvm-0.6.0/base/main.cpp
+--- scummvm-0.6.0./base/main.cpp       2004-03-14 14:45:12.000000000 +0100
++++ scummvm-0.6.0/base/main.cpp        2004-03-16 16:28:53.712974616 +0100
+@@ -262,7 +262,7 @@
+ 
+       // Free up memory
+       delete engine;
+-};
++}
+ 
+ #ifndef _WIN32_WCE
+ int main(int argc, char *argv[]) {

diff --git a/scummvm-makefile.patch b/scummvm-makefile.patch
deleted file mode 100644 (file)
index d604171..0000000
--- a/scummvm-makefile.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -ruN scummvm-0.3.0-/Makefile scummvm-0.3.0/Makefile
---- scummvm-0.3.0-/Makefile    Sun Dec  1 21:29:19 2002
-+++ scummvm-0.3.0/Makefile     Sun Dec  8 16:50:46 2002
-@@ -40,8 +40,8 @@
- LIBS    += -lmad
- 
- # Uncomment this to activate the Ogg Vorbis lib for compressed sound files
--# DEFINES += -DUSE_VORBIS
--# LIBS    += -lvorbisfile -lvorbis
-+DEFINES += -DUSE_VORBIS
-+LIBS    += -lvorbisfile -lvorbis
- 
- # Uncomment this to activate the ALSA lib for midi
- # DEFINES += -DUSE_ALSA