[vlc-devel] commit: Fix Bootstrap for Win64 and disable theora ASM for Win64 ( Jean-Baptiste Kempf )

[git version control]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Tue Aug 18 11:47:32 2009 +0200| [0edc093ce27d1061cdd7115e37889a412d243c6b] | committer: Jean-Baptiste Kempf 

Fix Bootstrap for Win64 and disable theora ASM for Win64

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=0edc093ce27d1061cdd7115e37889a412d243c6b
---

 extras/contrib/bootstrap    |    9 ++++++++-
 extras/contrib/src/Makefile |    3 +++
 2 files changed, 11 insertions(+), 1 deletions(-)

diff --git a/extras/contrib/bootstrap b/extras/contrib/bootstrap
index 6b78f9c..1ad3dcb 100755
--- 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 b1080ac..59487e7 100644
--- 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