Fix Bootstrap for Win64 and disable theora ASM for Win64

diff --git a/extras/contrib/bootstrap b/extras/contrib/bootstrap
index 6b78f9c1ddb9522d7c6a1d1fae1b13ea398eb070..1ad3dcbd1de1dda92442adba2cfd23107290daf3 100755 (executable)
--- a/extras/contrib/bootstrap
+++ b/extras/contrib/bootstrap
@@ -229,10 +229,17 @@ case $HOST in
         echo "PKG_CONFIG_PATH = \$(PREFIX)/lib/pkgconfig" >> config.mak
         cat src/Distributions/wince.mak >> distro.mak
     ;;
+    x86_64-*-mingw*)
+        echo "HAVE_WIN64 = 1" >> config.mak
+        echo "HAVE_WIN32 = 1" >> config.mak
+        echo "PKG_CONFIG_PATH = \$(PREFIX)/lib/pkgconfig" >> config.mak
+           EXTRA_CFLAGS="-O3"
+        cat src/Distributions/win32.mak >> distro.mak
+    ;;
     *mingw32*)
         echo "HAVE_WIN32 = 1" >> config.mak
         echo "PKG_CONFIG_PATH = \$(PREFIX)/lib/pkgconfig" >> config.mak
-           EXTRA_CFLAGS="-O3"
+        EXTRA_CFLAGS="-O3"
         cat src/Distributions/win32.mak >> distro.mak
     ;;
     i686-pc-cygwin)

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index b1080acd2acb767333fbbb1418fb5162e686c8c9..59487e7c33abfb51461aa85f11906a01d9472015 100644 (file)
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -815,6 +815,9 @@ endif
 ifdef HAVE_DARWIN_10
 THEORACONF += --disable-asm
 endif
+ifdef HAVE_WIN64
+THEORACONF += --disable-asm
+endif
 
 .theora: libtheora .ogg
 ifdef HAVE_BEOS