From 571a0bc63aec3b1c08b50c18fe0e7104c939c8f9 Mon Sep 17 00:00:00 2001 From: "K.Ohta" Date: Fri, 4 May 2018 06:29:18 +0900 Subject: [PATCH] [Build][WIN32] Update cross-build scripts. --- .../cmake/toolchain_mingw_cross_linux.cmake | 6 +++--- .../tool/cross-build/Qt5.10/config_sample.5.10.sh | 21 +++++++++++++-------- source/tool/cross-build/Qt5.10/make_cross.sh | 2 +- .../ffmpeg/bootstrap-build_ffmpeg4.0_cross.sh | 13 +++++++++++++ source/tool/cross-build/x264/bootstrap_x264.sh | 7 ++++++- 5 files changed, 36 insertions(+), 13 deletions(-) create mode 100644 source/tool/cross-build/ffmpeg/bootstrap-build_ffmpeg4.0_cross.sh diff --git a/source/build-cmake/cmake/toolchain_mingw_cross_linux.cmake b/source/build-cmake/cmake/toolchain_mingw_cross_linux.cmake index 7071a2dd5..89135cf1f 100644 --- a/source/build-cmake/cmake/toolchain_mingw_cross_linux.cmake +++ b/source/build-cmake/cmake/toolchain_mingw_cross_linux.cmake @@ -16,7 +16,7 @@ set(CMAKE_EXE_LINKER_FLAGS "-flto=6 -fwhole-program") #SET(CMAKE_CXX_ARCHIVE_CREATE " qcs --plugin==$(i686-264-mingw32-gcc --print-file-name=liblto_plugin.so) ") #SET(CMAKE_CXX_ARCHIVE_FINISH true) -set(LIBAV_ROOT_DIR "/usr/local/i586-mingw-msvc/ffmpeg-3.1.1") +set(LIBAV_ROOT_DIR "/usr/local/i586-mingw-msvc/ffmpeg-4.0") # here is the target environment located set(USE_SDL2 ON) @@ -24,14 +24,14 @@ if(USE_SDL2) SET(CMAKE_FIND_ROOT_PATH /usr/i686-w64-mingw32 /usr/local/i586-mingw-msvc /usr/local/i586-mingw-msvc/SDL/i686-w64-mingw32 - /usr/local/i586-mingw-msvc/5.7.1/mingw_621 + /usr/local/i586-mingw-msvc/5.10.1/mingw_73x # /usr/local/i586-mingw-msvc/5.5/mingw_530_win32 ) else() SET(CMAKE_FIND_ROOT_PATH /usr/i686-w64-mingw32 /usr/local/i586-mingw-msvc /usr/local/i586-mingw-msvc/SDL1/ - /usr/local/i586-mingw-msvc/5.7.1/mingw_621 + /usr/local/i586-mingw-msvc/5.10.1/mingw_73x # /usr/local/i586-mingw-msvc/5.5/mingw_530_win32 ) endif() diff --git a/source/tool/cross-build/Qt5.10/config_sample.5.10.sh b/source/tool/cross-build/Qt5.10/config_sample.5.10.sh index 373f4fad0..83ba6c8b1 100755 --- a/source/tool/cross-build/Qt5.10/config_sample.5.10.sh +++ b/source/tool/cross-build/Qt5.10/config_sample.5.10.sh @@ -1,4 +1,4 @@ -#/bin/sh +#!/bin/sh export PATH="$PATH:\ /usr/local/i586-mingw-msvc/icu/bin:\ /usr/local/i586-mingw-msvc/Angle/bin:\ @@ -6,8 +6,7 @@ export PATH="$PATH:\ /usr/local/i586-mingw-msvc/DirectX_June_2010/Developer\ Runtime/x86 \ " export PKG_CONFIG_LIBDIR=/usr/i686-w64-mingw32/lib - - +export PKG_CONFIG_SYSROOT_DIR=/usr/i686-w64-mingw32 #wine ./qtbase/configure.exe \ ./configure \ @@ -17,27 +16,33 @@ export PKG_CONFIG_LIBDIR=/usr/i686-w64-mingw32/lib -prefix /usr/local/i586-mingw-msvc/5.10.1/mingw_73x \ -opensource -confirm-license \ -xplatform win32-g++ \ - -qt-libpng -qt-libjpeg \ + -qt-libpng \ + -qt-libjpeg \ -qt-freetype \ -device-option CROSS_COMPILE=i686-w64-mingw32- \ -no-compile-examples \ + -skip qtactiveqt \ + -skip qtwebglplugin \ + -skip qtwebengine \ + -skip qtwebview \ + -skip qtquickcontrols \ -icu \ -nomake examples \ -nomake tests \ -D GL_GLEXT_PROTOTYPES \ -I /usr/local/i586-mingw-msvc/Angle/include \ -L /usr/local/i586-mingw-msvc/Angle/lib \ - -I /usr/local/i586-mingw-msvc/SDL/i686-w64-mingw32/include \ + -I /usr/local/i586-mingw-msvc/SDL/i686-w64-mingw32/include/SDL2 \ -L /usr/local/i586-mingw-msvc/SDL/i686-w64-mingw32/lib \ -I /usr/local/i586-mingw-msvc/DirectX_June_2010/Include \ -L /usr/local/i586-mingw-msvc/DirectX_June_2010/Lib/x86 \ -device-option ANGLE_PREFIX=/usr/local/i586-mingw-msvc/Angle \ -device-option SDL_PREFIX=/usr/local/i586-mingw-msvc/SDL/i686-w64-mingw32 \ + -device-option SDL2_PREFIX=/usr/local/i586-mingw-msvc/SDL/i686-w64-mingw32 \ -device-option ICU_PREFIX=/usr/local/i586-mingw-msvc/icu \ - -device-option DIRECTX_PREFIX=/usr/local/i586-mingw-msvc/DirectX_June_2010 \ + -device-option DIRECTX_PREFIX=/usr/local/i586-mingw-msvc \ -opengl dynamic \ -no-eglfs \ - -no-pkg-config \ $@ \ @@ -47,7 +52,7 @@ export PKG_CONFIG_LIBDIR=/usr/i686-w64-mingw32/lib # -angle \ # -combined-angle-lib \ # -qt-zlib \ -# -pkg-config \ +# -no-pkg-config \ # -largefile \ # -debug-and-release \ # -no-pch \ diff --git a/source/tool/cross-build/Qt5.10/make_cross.sh b/source/tool/cross-build/Qt5.10/make_cross.sh index 02207cdb4..7a72b7a71 100755 --- a/source/tool/cross-build/Qt5.10/make_cross.sh +++ b/source/tool/cross-build/Qt5.10/make_cross.sh @@ -7,4 +7,4 @@ export PATH="$PATH:\ " export PKG_CONFIG_LIBDIR=/usr/i686-w64-mingw32/lib -make CROSS_COMPILE=i686-w64-mingw32- PKG_CONFIG_LIBDIR=/usr/i686-w64-mingw32/lib $@ +make CROSS_COMPILE=i686-w64-mingw32- PKG_CONFIG_LIBDIR=/usr/i686-w64-mingw32/lib $@ 2>&1 diff --git a/source/tool/cross-build/ffmpeg/bootstrap-build_ffmpeg4.0_cross.sh b/source/tool/cross-build/ffmpeg/bootstrap-build_ffmpeg4.0_cross.sh new file mode 100644 index 000000000..79debff15 --- /dev/null +++ b/source/tool/cross-build/ffmpeg/bootstrap-build_ffmpeg4.0_cross.sh @@ -0,0 +1,13 @@ +#!/bin/sh +./configure --cross-prefix=i686-w64-mingw32- \ + --prefix=/usr/local/i586-mingw-msvc/ffmpeg-4.0 \ + --disable-static --enable-shared \ + --target-os=mingw32 --arch=i686 \ + --enable-gpl \ + --enable-libx264 \ + --enable-libvorbis \ + --enable-libmp3lame \ + --enable-dxva2 \ + --extra-cflags="-I/usr/local/i586-mingw-msvc/libx264-155/include -I/usr/local/i586-mingw-msvc/lame-3.99.5/include -I/usr/local/i586-mingw-msvc/libvorbis/include -I/usr/local/i586-mingw-msvc/libogg/include" \ + --extra-ldflags="-L/usr/local/i586-mingw-msvc/libx264-155/lib -L/usr/local/i586-mingw-msvc/lame-3.99.5/lib -L/usr/local/i586-mingw-msvc/libvorbis/lib -L/usr/local/i586-mingw-msvc/libogg/lib" + diff --git a/source/tool/cross-build/x264/bootstrap_x264.sh b/source/tool/cross-build/x264/bootstrap_x264.sh index b549a4687..4630a5049 100644 --- a/source/tool/cross-build/x264/bootstrap_x264.sh +++ b/source/tool/cross-build/x264/bootstrap_x264.sh @@ -1,2 +1,7 @@ #!/bin/sh -./configure --cross-prefix=i686-w64-mingw32- --host=i686-w64-mingw32 --enable-pic --enable-shared --enable-static +./configure --cross-prefix=i686-w64-mingw32- \ + --host=i686-w64-mingw32 \ + --enable-pic \ + --enable-shared \ + --enable-static \ + --prefix=/usr/local/i586-mingw-msvc/libx264-155 -- 2.11.0