OSDN Git Service

[BUILD][WIN32] Fix FTBFS.
authorK.Ohta <whatisthis.sowhat@gmail.com>
Wed, 10 Aug 2016 03:58:42 +0000 (12:58 +0900)
committerK.Ohta <whatisthis.sowhat@gmail.com>
Wed, 10 Aug 2016 03:58:42 +0000 (12:58 +0900)
source/build-cmake/buildvars.dat
source/build-cmake/buildvars_mingw_cross_win32.dat

index b458102..bdd4bf6 100644 (file)
@@ -27,7 +27,7 @@ MAKEFLAGS_CC="-g -O2  ${MAKEFLAGS_BASE} -flto -DNDEBUG"
 MAKEFLAGS_LIB_CXX="-flto -g -O2 ${MAKEFLAGS_BASE} -DNDEBUG" 
 MAKEFLAGS_LIB_CC="-flto -g -O2 ${MAKEFLAGS_BASE}  -DNDEBUG"
 
-MAKEFLAGS_GENERAL="-j4"
+MAKEFLAGS_GENERAL="-j2"
 
 BUILD_TYPE="Relwithdebinfo"
 CMAKE_LINKFLAG="-g -flto=6 -fwhole-program -O2 ${MAKEFLAGS_BASE}"
index c6a1ee9..af73127 100644 (file)
@@ -30,7 +30,7 @@ MAKEFLAGS_LIB_CC="-O2 ${MAKEFLAGS_BASE}  -DNDEBUG"
 #MAKEFLAGS_LIB_CXX="-O2 -flto -ffat-lto-objects -DNDEBUG" 
 #MAKEFLAGS_LIB_CC="-O2 -flto -ffat-lto-objects -DNDEBUG"
 
-MAKEFLAGS_GENERAL="-j3"
+MAKEFLAGS_GENERAL="-j2"
 
 #CMAKE_LINKFLAG="-static-libstdc++ -static-libgcc"
 CMAKE_LINKFLAG="-s"
@@ -41,6 +41,6 @@ CMAKE_APPENDFLAG="-DUSE_QT5_4_APIS=ON -DUSE_MOVIE_LOADER=ON -DUSE_MOVIE_SAVER=ON
 #                 -DCMAKE_RANLIB:STRING=i686-w64-mingw32-gcc-ranlib \
 #                 "
 
-CMAKE_APPENDFLAG="${CMAKE_APPENDFLAG} -DLIBAV_ROOT_DIR=/usr/local/i586-mingw-msvc/ffmpeg-3.0.2"
+CMAKE_APPENDFLAG="${CMAKE_APPENDFLAG} -DLIBAV_ROOT_DIR=/usr/local/i586-mingw-msvc/ffmpeg-3.1.1"