Commit 0edc093c authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf
Browse files

Fix Bootstrap for Win64 and disable theora ASM for Win64

parent ae0607b2
...@@ -229,10 +229,17 @@ case $HOST in ...@@ -229,10 +229,17 @@ case $HOST in
echo "PKG_CONFIG_PATH = \$(PREFIX)/lib/pkgconfig" >> config.mak echo "PKG_CONFIG_PATH = \$(PREFIX)/lib/pkgconfig" >> config.mak
cat src/Distributions/wince.mak >> distro.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*) *mingw32*)
echo "HAVE_WIN32 = 1" >> config.mak echo "HAVE_WIN32 = 1" >> config.mak
echo "PKG_CONFIG_PATH = \$(PREFIX)/lib/pkgconfig" >> config.mak echo "PKG_CONFIG_PATH = \$(PREFIX)/lib/pkgconfig" >> config.mak
EXTRA_CFLAGS="-O3" EXTRA_CFLAGS="-O3"
cat src/Distributions/win32.mak >> distro.mak cat src/Distributions/win32.mak >> distro.mak
;; ;;
i686-pc-cygwin) i686-pc-cygwin)
......
...@@ -815,6 +815,9 @@ endif ...@@ -815,6 +815,9 @@ endif
ifdef HAVE_DARWIN_10 ifdef HAVE_DARWIN_10
THEORACONF += --disable-asm THEORACONF += --disable-asm
endif endif
ifdef HAVE_WIN64
THEORACONF += --disable-asm
endif
.theora: libtheora .ogg .theora: libtheora .ogg
ifdef HAVE_BEOS ifdef HAVE_BEOS
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment