[BUILD][CMAKE][WIN32] Apply to Qt5,10 and FFMpeg 4.0.

diff --git a/source/build-cmake/cmake/toolchain_mingw_cross_linux.cmake b/source/build-cmake/cmake/toolchain_mingw_cross_linux.cmake
index 89135cf..f494d4b 100644 (file)
--- a/source/build-cmake/cmake/toolchain_mingw_cross_linux.cmake
+++ b/source/build-cmake/cmake/toolchain_mingw_cross_linux.cmake
@@ -24,6 +24,7 @@ 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
                          )
@@ -31,6 +32,7 @@ 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
                          )

diff --git a/source/build-cmake/params/buildvars_mingw_params_gcc.dat b/source/build-cmake/params/buildvars_mingw_params_gcc.dat
index 71cca2b..467eb72 100644 (file)
--- a/source/build-cmake/params/buildvars_mingw_params_gcc.dat
+++ b/source/build-cmake/params/buildvars_mingw_params_gcc.dat
@@ -80,7 +80,8 @@ esac
 
 #CMAKE_APPENDFLAG="-DUSE_QT5_4_APIS=ON -DUSE_MOVIE_LOADER=ON \
 
-CMAKE_APPENDFLAG="-DUSE_QT5_4_APIS=ON -DUSE_MOVIE_LOADER=ON \
+CMAKE_APPENDFLAG=" -DUSE_QT5_4_APIS=ON \
+                   -DUSE_MOVIE_LOADER=ON \
                    -DUSE_MOVIE_SAVER=ON \
                    -DCMAKE_AR:STRING=i686-w64-mingw32-gcc-ar \
                    -DCMAKE_LD:STRING=i686-w64-mingw32-gcc-ld \