From 52d8887f5e2ef6cb5dbe7c1d34264d8a9e9d169f Mon Sep 17 00:00:00 2001 From: Anton Fedchin Date: Mon, 19 Sep 2016 11:41:46 +0300 Subject: [buildsteps] win32: use proper way to set VC env vars (depends on build arch). --- tools/buildsteps/win32/make-mingwlibs.bat | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tools/buildsteps/win32/make-mingwlibs.bat b/tools/buildsteps/win32/make-mingwlibs.bat index d1567a0adc..0d94facd05 100644 --- a/tools/buildsteps/win32/make-mingwlibs.bat +++ b/tools/buildsteps/win32/make-mingwlibs.bat @@ -3,14 +3,13 @@ SETLOCAL rem batch file to compile mingw libs via BuildSetup SET WORKDIR=%base_dir% -rem set M$ env -call "%VS140COMNTOOLS%\..\..\VC\bin\vcvars32.bat" || exit /b 1 SET PROMPTLEVEL=prompt SET BUILDMODE=clean SET opt=mintty SET build32=yes SET build64=no +SET vcarch=x86 SET msys2=msys64 SET tools=mingw FOR %%b in (%1, %2, %3) DO ( @@ -21,9 +20,12 @@ FOR %%b in (%1, %2, %3) DO ( IF %%b==build64 ( SET build64=yes SET build32=no + SET vcarch=x64 ) IF %%b==msvc SET tools=msvc ) +rem set MSVC env +call "%VS140COMNTOOLS%..\..\VC\vcvarsall.bat" %vcarch% || exit /b 1 IF "%WORKDIR%"=="" ( SET WORKDIR=%~dp0\..\..\.. -- cgit v1.2.3 From 8ece471365541f9726e78c31e3e4eb7b8c8b00ef Mon Sep 17 00:00:00 2001 From: Anton Fedchin Date: Mon, 19 Sep 2016 11:43:03 +0300 Subject: [buildsteps] win32: fix build ffmpeg with msvc toolchain. --- tools/buildsteps/win32/buildffmpeg.sh | 26 ++++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/tools/buildsteps/win32/buildffmpeg.sh b/tools/buildsteps/win32/buildffmpeg.sh index 99515fd0a5..7caecb6a77 100644 --- a/tools/buildsteps/win32/buildffmpeg.sh +++ b/tools/buildsteps/win32/buildffmpeg.sh @@ -7,6 +7,7 @@ FFMPEG_CONFIG_FILE=/xbmc/tools/buildsteps/win32/fmpeg_options.txt FFMPEG_VERSION_FILE=/xbmc/tools/depends/target/ffmpeg/FFMPEG-VERSION FFMPEG_BASE_OPTS="--disable-debug --disable-doc --enable-gpl --enable-gnutls --enable-w32threads" FFMPEG_DEFAULT_OPTS="" +FFMPEG_TARGET_OS=mingw32 do_loaddeps $FFMPEG_VERSION_FILE FFMPEGDESTDIR=/xbmc/lib/win32/$LIBNAME @@ -20,10 +21,12 @@ do_getFFmpegConfig() { if [[ $BITS = "64bit" ]]; then arch=x86_64 + FFMPEG_TARGET_OS=mingw64 # perhaps it's not optimal do_addOption "--cpu=core2" else arch=x86 + FFMPEG_TARGET_OS=mingw32 do_addOption "--cpu=i686" fi export arch @@ -85,15 +88,22 @@ if [[ "$tools" = "msvc" ]]; then do_addOption "--enable-debug" do_addOption "--toolchain=msvc" - PATH="/c/Program Files (x86)/Microsoft Visual Studio 12.0/VC/BIN/":$PATH - CFLAGS="" - CXXFLAGS="" - LDFLAGS="" - export PATH CFLAGS CXXFLAGS LDFLAGS + # set path to MS cl.exe and link.exe first + if [[ $BITS = "64bit" ]]; then + FFMPEG_TARGET_OS=win64 + VCTOOLSPATH="$VS140COMNTOOLS../../VC/BIN/amd64" + else + FFMPEG_TARGET_OS=win32 + VCTOOLSPATH="$VS140COMNTOOLS../../VC/BIN/" + fi + + export PATH="$VCTOOLSPATH":$PATH + export CFLAGS="" + export CXXFLAGS="" + export LDFLAGS="" extra_cflags="-MDd -I$LOCALDESTDIR/include" - extra_ldflags="-LIBPATH:\"$LOCALDESTDIR/lib\" -LIBPATH:\"/mingw32/lib\" /NODEFAULTLIB:libcmt" - TARGET_OS=win32 + extra_ldflags="-LIBPATH:\"$LOCALDESTDIR/lib\" -LIBPATH:\"$MINGW_PREFIX/lib\" /NODEFAULTLIB:libcmt" fi cd $LOCALBUILDDIR @@ -133,7 +143,7 @@ do_print_status "$LIBNAME-$VERSION (${BITS})" "$blue_color" "Configuring" [[ -z "$extra_cflags" ]] && extra_cflags=-DPTW32_STATIC_LIB [[ -z "$extra_ldflags" ]] && extra_ldflags=-static-libgcc -./configure --target-os=mingw32 --prefix=$FFMPEGDESTDIR --arch=$arch \ +./configure --target-os=$FFMPEG_TARGET_OS --prefix=$FFMPEGDESTDIR --arch=$arch \ --disable-static --enable-shared $FFMPEG_OPTS_SHARED \ --extra-cflags="$extra_cflags" --extra-ldflags="$extra_ldflags" -- cgit v1.2.3 From 203ba4649c178a60e660402d5a6f2dc13e6056ef Mon Sep 17 00:00:00 2001 From: Anton Fedchin Date: Mon, 19 Sep 2016 11:45:56 +0300 Subject: [buildsteps] win32: ffmpeg: disable unused dxva2 support (also fixes linking with msvc toolchain). --- tools/buildsteps/win32/fmpeg_options.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/buildsteps/win32/fmpeg_options.txt b/tools/buildsteps/win32/fmpeg_options.txt index fb9f2954fc..891a79ed4d 100644 --- a/tools/buildsteps/win32/fmpeg_options.txt +++ b/tools/buildsteps/win32/fmpeg_options.txt @@ -18,3 +18,4 @@ --enable-encoder=mjpeg --enable-protocol=http --enable-runtime-cpudetect +--disable-dxva2 \ No newline at end of file -- cgit v1.2.3 From 3aefaa46e82464111f6d3cf4917cbcefacf8d358 Mon Sep 17 00:00:00 2001 From: Anton Fedchin Date: Mon, 19 Sep 2016 11:54:11 +0300 Subject: [mingw] dependencies: bump gnutls version. --- project/BuildDependencies/DownloadMingwBuildEnv.bat | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/project/BuildDependencies/DownloadMingwBuildEnv.bat b/project/BuildDependencies/DownloadMingwBuildEnv.bat index 616c718010..cffcc14aa9 100644 --- a/project/BuildDependencies/DownloadMingwBuildEnv.bat +++ b/project/BuildDependencies/DownloadMingwBuildEnv.bat @@ -29,8 +29,8 @@ set build64=no set instdir=%CD% set msyspackages=autoconf automake libtool m4 make gettext patch pkg-config wget p7zip coreutils set mingwpackages=dlfcn gcc gcc-libs gettext libiconv libgpg-error libpng yasm nettle libtasn1 openssl -set locals32=gnutls-3.4.9-static -set locals64=gnutls-3.4.9-static +set locals32=gnutls-3.4.14-static +set locals64=gnutls-3.4.14-static set usemirror=yes set opt=mintty -- cgit v1.2.3 From 58b160cb8f67fde77d934aa963ed4eb8de21829a Mon Sep 17 00:00:00 2001 From: Anton Fedchin Date: Thu, 24 Mar 2016 15:49:03 +0300 Subject: [mingw] dependencies: added liblzma to dependencies. allows build ffmpeg with lzma support. --- project/BuildDependencies/DownloadMingwBuildEnv.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/BuildDependencies/DownloadMingwBuildEnv.bat b/project/BuildDependencies/DownloadMingwBuildEnv.bat index cffcc14aa9..6f168013dd 100644 --- a/project/BuildDependencies/DownloadMingwBuildEnv.bat +++ b/project/BuildDependencies/DownloadMingwBuildEnv.bat @@ -28,7 +28,7 @@ set build32=yes set build64=no set instdir=%CD% set msyspackages=autoconf automake libtool m4 make gettext patch pkg-config wget p7zip coreutils -set mingwpackages=dlfcn gcc gcc-libs gettext libiconv libgpg-error libpng yasm nettle libtasn1 openssl +set mingwpackages=dlfcn gcc gcc-libs gettext libiconv libgpg-error libpng yasm nettle libtasn1 openssl xz set locals32=gnutls-3.4.14-static set locals64=gnutls-3.4.14-static set usemirror=yes -- cgit v1.2.3 From 506be167c180d9a7be1aeff499bada661a1d74ca Mon Sep 17 00:00:00 2001 From: Anton Fedchin Date: Thu, 12 May 2016 15:29:23 +0300 Subject: [buildsteps] win32: ffmpeg: fixed possible build hang if ffmpeg build failed. --- tools/buildsteps/win32/buildffmpeg.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/buildsteps/win32/buildffmpeg.sh b/tools/buildsteps/win32/buildffmpeg.sh index 7caecb6a77..3eb683eae6 100644 --- a/tools/buildsteps/win32/buildffmpeg.sh +++ b/tools/buildsteps/win32/buildffmpeg.sh @@ -148,7 +148,7 @@ do_print_status "$LIBNAME-$VERSION (${BITS})" "$blue_color" "Configuring" --extra-cflags="$extra_cflags" --extra-ldflags="$extra_ldflags" do_makelib && -cp $FFMPEGDESTDIR/bin/*.dll /xbmc/system/ && +cp $FFMPEGDESTDIR/bin/*.dll /xbmc/system/ #remove the bgprocessfile for signaling the process end if [ -f $BGPROCESSFILE ]; then -- cgit v1.2.3