Download-Tools/mkvtoolnix
1
0
Fork 0
mirror of https://gitlab.com/mbunkus/mkvtoolnix.git synced 2024-12-25 04:11:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Windows build system: update instructions & automatic build script for gcc6

Browse Source
This commit is contained in:
Moritz Bunkus 2016-12-20 19:52:06 +01:00
parent 3ea60df240
commit 55b5f0af25
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
README.Windows.md
View File

@ -88,9 +88,10 @@ Next, build the required libraries (change `MXE_TARGETS` to
one, and increase `JOBS` if you have more than one core):
cd $HOME/mxe
make MXE_TARGETS=x86_64-w64-mingw32.static JOBS=2 \
gettext libiconv zlib boost curl file flac lzo ogg pthreads \
vorbis qtbase qttranslations qtwinextras
make MXE_TARGETS=x86_64-w64-mingw32.static MXE_PLUGIN_DIRS=plugins/gcc6 \
JOBS=2 \
gettext libiconv zlib boost curl file flac lzo ogg pthreads vorbis \
qtbase qttranslations qtwinextras
Append the installation directory to your `PATH` variable:

13
tools/windows/setup_cross_compilation_env.sh
View File

@ -19,7 +19,7 @@ ARCHITECTURE=64
INSTALL_DIR=${INSTALL_DIR:-$HOME/mxe}
# Leave PARALLEL empty if you want the script to use all of your CPU
# cores.
PARALLEL=${PARALLEL:-$(( $(awk '/^core id/ { print $4 }' /proc/cpuinfo | sort | tail -n 1) + 2 ))}
PARALLEL=${PARALLEL:-$(nproc --all)}
#
# END OF SETUP -- usually no need to change anything else
@ -46,11 +46,14 @@ function update_mingw_cross_env {
cd ${INSTALL_DIR}
cat > settings.mk <<EOF
MXE_TARGETS=${HOST}
JOBS=${PARALLEL}
MXE_TARGETS = ${HOST}
MXE_PLUGIN_DIRS += plugins/gcc6
JOBS = ${PARALLEL}
mkvtoolnix-deps:
+make gettext libiconv zlib boost curl file flac lzo ogg pthreads vorbis qtbase qttranslations qtwinextras
MKVTOOLNIX_DEPENDENCIES=gettext libiconv zlib boost curl file flac lzo ogg pthreads vorbis
MKVTOOLNIX_DEPENDENCIES+=qtbase qttranslations qtwinextras
mkvtoolnix-deps: \$(MKVTOOLNIX_DEPENDENCIES)
EOF
}