5 files changed, 43 insertions, 21 deletions

diff --git a/emulators/vba/files/patch-Makefile.in b/emulators/vba/files/patch-Makefile.in
new file mode 100644
index 000000000000..395f05954c7d
--- /dev/null
+++ b/emulators/vba/files/patch-Makefile.in
@@ -0,0 +1,11 @@
+--- Makefile.in.orig	Thu Oct 13 13:38:04 2005
++++ Makefile.in	Thu Oct 13 13:38:12 2005
+@@ -46,7 +46,7 @@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+-CFLAGS = @CFLAGS@
++CFLAGS += @CFLAGS@
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
diff --git a/emulators/vba/files/patch-aa b/emulators/vba/files/patch-aa
deleted file mode 100644
index 287dace14459..000000000000
--- a/emulators/vba/files/patch-aa
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/sdl/SDL.cpp.orig	Sun Feb  8 14:45:01 2004
-+++ src/sdl/SDL.cpp		Tue Feb 10 14:45:09 2004
-@@ -621,7 +621,7 @@
-   }
- #else
- #define SDL_CALL_STRETCHER \
--        asm volatile("call *%%eax"::"a" (stretcher),"S" (src),"D" (dest))
-+        asm volatile("call *%%eax" : "=a" (stretcher),"=S" (src),"=D" (dest))
- #endif
- #else
- #define SDL_CALL_STRETCHER \
diff --git a/emulators/vba/files/patch-src-getopt.h b/emulators/vba/files/patch-src-getopt.h
new file mode 100644
index 000000000000..3604c8d4ac6d
--- /dev/null
+++ b/emulators/vba/files/patch-src-getopt.h
@@ -0,0 +1,11 @@
+--- src/getopt.h.orig	Sun Oct  9 23:31:12 2005
++++ src/getopt.h	Sun Oct  9 23:31:25 2005
+@@ -112,7 +112,7 @@
+ extern int getopt (int argc, char *const *argv, const char *shortopts);
+ #else /* not __GNU_LIBRARY__ */
+ # if !defined (HAVE_DECL_GETOPT)
+-extern int getopt ();
++//extern int getopt ();
+ # endif
+ #endif /* __GNU_LIBRARY__ */
+ extern int getopt_long (int argc, char *const *argv, const char *shortopts,
diff --git a/emulators/vba/files/patch-src-remote.cpp b/emulators/vba/files/patch-src-remote.cpp
new file mode 100644
index 000000000000..165fd833b796
--- /dev/null
+++ b/emulators/vba/files/patch-src-remote.cpp
@@ -0,0 +1,10 @@
+--- src/remote.cpp.old	Thu May 20 19:24:47 2004
++++ src/remote.cpp	Thu Aug 19 18:16:57 2004
+@@ -22,6 +22,7 @@
+ 
+ #ifndef WIN32
+ # include <unistd.h>
++# undef _BSD_SOCKLEN_T_
+ # include <sys/socket.h>
+ # include <netdb.h>
+ # ifdef HAVE_NETINET_IN_H
diff --git a/emulators/vba/files/patch-src-sdl-SDL.cpp b/emulators/vba/files/patch-src-sdl-SDL.cpp
index 165fd833b796..287dace14459 100644
--- a/emulators/vba/files/patch-src-sdl-SDL.cpp
+++ b/emulators/vba/files/patch-src-sdl-SDL.cpp
@@ -1,10 +1,11 @@
---- src/remote.cpp.old	Thu May 20 19:24:47 2004
-+++ src/remote.cpp	Thu Aug 19 18:16:57 2004
-@@ -22,6 +22,7 @@
- 
- #ifndef WIN32
- # include <unistd.h>
-+# undef _BSD_SOCKLEN_T_
- # include <sys/socket.h>
- # include <netdb.h>
- # ifdef HAVE_NETINET_IN_H
+--- src/sdl/SDL.cpp.orig	Sun Feb  8 14:45:01 2004
++++ src/sdl/SDL.cpp		Tue Feb 10 14:45:09 2004
+@@ -621,7 +621,7 @@
+   }
+ #else
+ #define SDL_CALL_STRETCHER \
+-        asm volatile("call *%%eax"::"a" (stretcher),"S" (src),"D" (dest))
++        asm volatile("call *%%eax" : "=a" (stretcher),"=S" (src),"=D" (dest))
+ #endif
+ #else
+ #define SDL_CALL_STRETCHER \