Fix Bootstrap for Win64 and disable theora ASM for Win64
authorJean-Baptiste Kempf <jb@videolan.org>
Tue, 18 Aug 2009 09:47:32 +0000 (11:47 +0200)
committerJean-Baptiste Kempf <jb@videolan.org>
Tue, 18 Aug 2009 09:47:32 +0000 (11:47 +0200)
extras/contrib/bootstrap
extras/contrib/src/Makefile

index 6b78f9c..1ad3dcb 100755 (executable)
@@ -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)
index b1080ac..59487e7 100644 (file)
@@ -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