goom is patched on win32 too

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index 31ea5c8ad450d19a2413a3f9bbd8790261754c8a..52aa3f72509df2d52e0a7c4a7542b4f493f763a9 100644 (file)
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -1121,13 +1121,13 @@ goom: goom$(GOOM2k4_VERSION).tar.gz
 ifdef HAVE_DARWIN_OS
        patch -p 0 < Patches/goom.patch
        patch -p 0 < Patches/goom2k4-0-mmx.patch
+else
+       patch -p 0 < Patches/goom2k4-0-nommx.patch
 endif
 ifdef HAVE_WIN32
        (cd $@; dos2unix configure.in)
        patch -p 0 <Patches/goom2k4-0-win32.patch
 endif
-ifndef HAVE_DARWIN_OS
-       (cd goom; patch -p 0 <../Patches/goom2k4-0-nommx.patch; cd -)
 endif
 
 .goom2k4: goom

diff --git a/extras/contrib/src/Patches/goom2k4-0-nommx.patch b/extras/contrib/src/Patches/goom2k4-0-nommx.patch
index 169377eafff5ed351e9d964adc9d7d9f88f777f2..af0cd3876f8bc54d3b46b2ffffa4c76cb7bef9be 100644 (file)
--- a/extras/contrib/src/Patches/goom2k4-0-nommx.patch
+++ b/extras/contrib/src/Patches/goom2k4-0-nommx.patch
@@ -1,5 +1,5 @@
---- configure.in.orig  2006-07-13 17:23:23.000000000 +0200
-+++ configure.in       2006-07-13 17:23:37.000000000 +0200
+--- goom.orig/configure.in     2005-02-07 14:46:41.000000000 +0100
++++ goom/configure.in  2006-10-14 22:59:48.000000000 +0200
 @@ -58,7 +58,7 @@
  dnl ARCH\r
  case "$host" in\r