\r[BUILD][WIN32] Fix FTBFS.

diff --git a/source/build-cmake/buildvars_mingw.dat b/source/build-cmake/buildvars_mingw.dat
index 9815fe0..db9fb44 100644 (file)
--- a/source/build-cmake/buildvars_mingw.dat
+++ b/source/build-cmake/buildvars_mingw.dat
@@ -4,32 +4,34 @@ CCMAKE_CXX=g++
 
 BUILD_TYPE="Release"
 
-MAKEFLAGS_BASE="-fvect-cost-model=dynamic -ftree-vectorize \
-               -ftree-loop-distribute-patterns \
-               -ftree-loop-optimize -ftree-loop-if-convert-stores \
-               -fbranch-probabilities -fbranch-target-load-optimize \
-               -fselective-scheduling -fsel-sched-pipelining -fsel-sched-pipelining-outer-loops \
-                -funroll-loops \
-               -fgraphite-identity \
-               -floop-nest-optimize \
-               "
 #MAKEFLAGS_BASE="-fvect-cost-model=dynamic -ftree-vectorize \
 #               -ftree-loop-distribute-patterns \
-#             -ftree-loop-optimize -ftree-loop-if-convert-stores \
-#             -fbranch-probabilities -fbranch-target-load-optimize"
+#              -ftree-loop-optimize -ftree-loop-if-convert-stores \
+#              -fbranch-probabilities -fbranch-target-load-optimize \
+#              -fselective-scheduling -fsel-sched-pipelining -fsel-sched-pipelining-outer-loops \
+#               -funroll-loops \
+#              -fgraphite-identity \
+#              -floop-nest-optimize \
+#              "
+MAKEFLAGS_BASE="-fvect-cost-model=dynamic -ftree-vectorize \
+               -ftree-loop-distribute-patterns \
+              -ftree-loop-optimize -ftree-loop-if-convert-stores \
+              -fbranch-probabilities -fbranch-target-load-optimize"
 #MAKEFLAGS_BASE="-ftree-vectorize"
 
-MAKEFLAGS_CXX="-flto -O3 ${MAKEFLAGS_BASE} -DNDEBUG" 
-MAKEFLAGS_CC="-flto -O3  ${MAKEFLAGS_BASE} -DNDEBUG"
-#MAKEFLAGS_CXX="-O0 -flto -DNDEBUG" 
-#MAKEFLAGS_CC="-O0 -flto -DNDEBUG"
+#MAKEFLAGS_CXX="-O3 ${MAKEFLAGS_BASE} -DNDEBUG" 
+#MAKEFLAGS_CC="-O3  ${MAKEFLAGS_BASE} -DNDEBUG"
+MAKEFLAGS_CXX="-O0 -flto -DNDEBUG" 
+MAKEFLAGS_CC="-O0 -flto -DNDEBUG"
 
-MAKEFLAGS_LIB_CXX="-flto -O3 ${MAKEFLAGS_BASE} -DNDEBUG" 
-MAKEFLAGS_LIB_CC="-flto -O3 ${MAKEFLAGS_BASE}  -DNDEBUG"
+#MAKEFLAGS_LIB_CXX="-O3 ${MAKEFLAGS_BASE} -DNDEBUG" 
+#MAKEFLAGS_LIB_CC="-O3 ${MAKEFLAGS_BASE}  -DNDEBUG"
+MAKEFLAGS_CXX="-O0 -flto -DNDEBUG" 
+MAKEFLAGS_CC="-O0 -flto -DNDEBUG"
 
 MAKEFLAGS_GENERAL="-j4"
 
-CMAKE_LINKFLAG="-DCMAKE_EXE_LINKER_FLAGS:STRING=\"-s -flto=4 -O3 -fvect-cost-model=dynamic -ftree-vectorize -fwhole-program\""
+CMAKE_LINKFLAG="-DCMAKE_EXE_LINKER_FLAGS:STRING=-s -flto=4 -O3 ${MAKEFLAGS_BASE} -fwhole-program"
 CMAKE_APPENDFLAG="-DCMAKE_AR:STRING=gcc-ar -DCMAKE_LD:STRING=gcc-ld -DCMAKE_NM:STRING=gcc-nm -DCMAKE_RANLIB:STRING=gcc-ranlib"
 
 

diff --git a/source/build-cmake/config_build_cross_win32.sh b/source/build-cmake/config_build_cross_win32.sh
index 4f96026..70411fb 100755 (executable)
--- a/source/build-cmake/config_build_cross_win32.sh
+++ b/source/build-cmake/config_build_cross_win32.sh
@@ -25,6 +25,9 @@ MAKEFLAGS_GENERAL="-j4"
 MAKEFLAGS_CXX="${MAKEFLAGS_CXX} -DWINVER=0x501"
 MAKEFLAGS_CC="${MAKEFLAGS_CC} -DWINVER=0x501"
 
+MAKEFLAGS_LIB_CXX="${MAKEFLAGS_LIB_CXX} -DWINVER=0x501"
+MAKEFLAGS_LIB_CC="${MAKEFLAGS_LIB_CC} -DWINVER=0x501"
+
 case ${BUILD_TYPE} in
     "Debug" | "DEBUG" | "debug" ) 
             CMAKE_FLAGS1="-DCMAKE_BUILD_TYPE:STRING=debug"

diff --git a/source/build-cmake/config_build_mingw.sh b/source/build-cmake/config_build_mingw.sh
index dbc285f..d78ca90 100755 (executable)
--- a/source/build-cmake/config_build_mingw.sh
+++ b/source/build-cmake/config_build_mingw.sh
@@ -17,7 +17,9 @@ fi
 
 
 MAKEFLAGS_CXX="${MAKEFLAGS_CXX} -DWINVER=0x501"
-MAKEFLAGS_CC="${MAKEFLAGS_CXX} -DWINVER=0x501"
+MAKEFLAGS_CC="${MAKEFLAGS_CC} -DWINVER=0x501"
+MAKEFLAGS_LIB_CXX="${MAKEFLAGS_LIB_CXX} -DWINVER=0x501"
+MAKEFLAGS_LIB_CC="${MAKEFLAGS_LIB_CC} -DWINVER=0x501"
 
 case ${BUILD_TYPE} in
     "Debug" | "DEBUG" | "debug" ) 
@@ -63,7 +65,7 @@ ${CMAKE} -D CMAKE_C_COMPILER:STRING=${CCMAKE_CC}  \
         ${CMAKE_LINKFLAG} \
         .. | tee -a make.log
         
-mingw32-make clean
+#mingw32-make clean
 mingw32-make ${MAKEFLAGS_GENERAL} 2>&1 | tee -a ./make.log
 
 case $? in
@@ -74,7 +76,7 @@ case $? in
       ;;
       * ) exit $? ;;
 esac
-#make clean
+#mingw32-make clean
 cd ../..
 
 for SRCDATA in $@ ; do\
@@ -102,7 +104,7 @@ for SRCDATA in $@ ; do\
             ${CMAKE_LINKFLAG} \
             .. | tee -a make.log
 
-    mingw32-make clean
+#    mingw32-make clean
     
     mingw32-make ${MAKEFLAGS_GENERAL} 2>&1 | tee -a ./make.log
     case $? in
@@ -111,13 +113,13 @@ for SRCDATA in $@ ; do\
       * ) exit $? ;;
     esac
     
-    mingw32-make clean
+#    mingw32-make clean
     cd ../..
 done
 
 cd libCSPgui/build-win32
 
-mingw32-make clean
+#mingw32-make clean
 cd ../..
 
 exit 0

diff --git a/source/src/qt/common/CMakeLists.txt b/source/src/qt/common/CMakeLists.txt
index b0219b7..97d3578 100644 (file)
--- a/source/src/qt/common/CMakeLists.txt
+++ b/source/src/qt/common/CMakeLists.txt
@@ -49,7 +49,11 @@ endif()
 if(WIN32)
  target_link_libraries(${EXEC_TARGET} 
  ${LOCAL_LIBS}
- ${CMAKE_SOURCE_DIR}/../../build-cmake/libCSPgui/build-win32/qt/gui/libqt_gui.a ${BUNDLE_LIBS} Qt5::OpenGL)
+ ${CMAKE_SOURCE_DIR}/../../build-cmake/libCSPgui/build-win32/qt/gui/libqt_gui.a
+ ${BUNDLE_LIBS} 
+ ${CMAKE_SOURCE_DIR}/../../build-cmake/libCSPgui/build-win32/qt/gui/libqt_gui.a
+ Qt5::OpenGL
+ )
 else()
  target_link_libraries(${EXEC_TARGET} ${LOCAL_LIBS} ${BUNDLE_LIBS})
 endif()