summaryrefslogtreecommitdiffstats
path: root/DOCS
diff options
context:
space:
mode:
authorTimothy Gu <timothygu99@gmail.com>2014-02-15 18:15:56 -0800
committerwm4 <wm4@nowhere>2014-02-17 02:52:58 +0100
commitd85e2588cf9c2120bec7960ab4e793f4208b27c1 (patch)
tree6112bab7b63cf07a9418b49070fecf66f6c59c3b /DOCS
parentda4e33074e0b7b8a5e1952e96f50f742e7d6f99c (diff)
downloadmpv-d85e2588cf9c2120bec7960ab4e793f4208b27c1.tar.bz2
mpv-d85e2588cf9c2120bec7960ab4e793f4208b27c1.tar.xz
DOCS/crosscompile-mingw: use settings.mk instead of make variables
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Diffstat (limited to 'DOCS')
-rw-r--r--DOCS/crosscompile-mingw.md29
1 files changed, 20 insertions, 9 deletions
diff --git a/DOCS/crosscompile-mingw.md b/DOCS/crosscompile-mingw.md
index 9393d37c4b..06f759651d 100644
--- a/DOCS/crosscompile-mingw.md
+++ b/DOCS/crosscompile-mingw.md
@@ -37,19 +37,29 @@ cd /opt
git clone https://github.com/mxe/mxe mingw
cd mingw
-# Build required packages. The following provide a minimum required to build
-# mpv.
+# Set build options.
# The JOBS environment variable controls threads to use when building. DO NOT
-# use the regular `make -j4` option with MXE. Alternatively, you can make this
-# a default so you don't need to type `JOBS=4` every time you build:
-# echo "JOBS := 4" >> settings.mk
+# use the regular `make -j4` option with MXE as it will slow down the build.
+# Alternatively, you can set this in the make command by appending "JOBS=4"
+# to the end of command:
+echo "JOBS := 4" >> settings.mk
# The MXE_TARGET environment variable builds MinGW-w64 for 32 bit targets.
-# You can make this a default:
-# echo "MXE_TARGETS := i686-w64-mingw32" >> settings.mk
+# Alternatively, you can specify this in the make command by appending
+# "MXE_TARGETS=i686-w64-mingw32" to the end of command:
+echo "MXE_TARGETS := i686-w64-mingw32" >> settings.mk
+
+# If you want to build 64 bit version, use this:
+# echo "MXE_TARGETS := x86_64-w64-mingw32" >> settings.mk
-make gcc ffmpeg libass jpeg pthreads MXE_TARGETS=i686-w64-mingw32 JOBS=4
+# Build required packages. The following provide a minimum required to build
+# mpv.
+
+make gcc ffmpeg libass jpeg pthreads
+
+# Add MXE binaries to $PATH
+export PATH=/opt/mingw/usr/bin/:$PATH
# Build mpv. The target will be used to automatically select the name of the
# build tools involved (e.g. it will use i686-w64-mingw32-gcc).
@@ -57,7 +67,8 @@ make gcc ffmpeg libass jpeg pthreads MXE_TARGETS=i686-w64-mingw32 JOBS=4
cd ..
git clone https://github.com/mpv-player/mpv.git
cd mpv
-export PATH=/opt/mingw/usr/bin/:$PATH
DEST_OS=win32 TARGET=i686-w64-mingw32 ./waf configure
+# Or, if 64 bit version,
+# DEST_OS=win32 TARGET=x86_64-w64-mingw32 ./waf configure
./waf build
```