From d50f7d1ceb76ec627b3064ed4b328b019795dd49 Mon Sep 17 00:00:00 2001
From: "K.Ohta" <whatisthis.sowhat@gmail.com>
Date: Mon, 16 May 2016 17:17:16 +0900
Subject: [PATCH] [BUILD][WIN32] Work even gcc version is not same as native
 mingw (4.9.2).

---
 source/build-cmake/buildvars_mingw.dat             |  4 +++-
 source/build-cmake/buildvars_mingw_cross_win32.dat | 16 +++++++---------
 source/build-cmake/config_build_mingw.sh           | 10 +++++-----
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/source/build-cmake/buildvars_mingw.dat b/source/build-cmake/buildvars_mingw.dat
index 617f45c40..d04544bf6 100644
--- a/source/build-cmake/buildvars_mingw.dat
+++ b/source/build-cmake/buildvars_mingw.dat
@@ -31,7 +31,9 @@ MAKEFLAGS_LIB_CC="-O3 ${MAKEFLAGS_BASE}  -DNDEBUG"
 
 MAKEFLAGS_GENERAL="-j4"
 
-#CMAKE_LINKFLAG="-DCMAKE_EXE_LINKER_FLAGS:STRING=-s -O3 ${MAKEFLAGS_BASE} -fwhole-program"
+#CMAKE_LINKFLAG="-DCMAKE_EXE_LINKER_FLAGS:STRING=-s -O3 -flto ${MAKEFLAGS_BASE} -fwhole-program -static-libgcc -static-libstdc++"
+CMAKE_LINKFLAG="-DCMAKE_EXE_LINKER_FLAGS:STRING=-s -static-libgcc -static-libstdc++"
+
 #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/buildvars_mingw_cross_win32.dat b/source/build-cmake/buildvars_mingw_cross_win32.dat
index 1c059e4b2..a09e4e0a0 100644
--- a/source/build-cmake/buildvars_mingw_cross_win32.dat
+++ b/source/build-cmake/buildvars_mingw_cross_win32.dat
@@ -12,23 +12,21 @@ MAKEFLAGS_BASE="-fvect-cost-model=dynamic -ftree-vectorize \
 		-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="-O3 ${MAKEFLAGS_BASE} -DNDEBUG" 
 MAKEFLAGS_CC="-O3  ${MAKEFLAGS_BASE} -DNDEBUG"
-#MAKEFLAGS_CXX="-O0 -flto -DNDEBUG" 
-#MAKEFLAGS_CC="-O0 -flto -DNDEBUG"
+#MAKEFLAGS_CXX="-O0 -flto -ffat-lto-objects -DNDEBUG" 
+#MAKEFLAGS_CC="-O0 -flto -ffat-lto-objects -DNDEBUG"
 
 MAKEFLAGS_LIB_CXX="-O3 ${MAKEFLAGS_BASE} -DNDEBUG" 
 MAKEFLAGS_LIB_CC="-O3 ${MAKEFLAGS_BASE}  -DNDEBUG"
+#MAKEFLAGS_LIB_CXX="-O0 -flto -ffat-lto-objects -DNDEBUG" 
+#MAKEFLAGS_LIB_CC="-O0 -flto -ffat-lto-objects -DNDEBUG"
 
 MAKEFLAGS_GENERAL="-j6"
 
-#CMAKE_LINKFLAG="-DCMAKE_EXE_LINKER_FLAGS:STRING=\"-s -flto=6 -O3 -fvect-cost-model=dynamic -ftree-vectorize -fwhole-program\""
-#CMAKE_APPENDFLAG="-DCMAKE_AR:STRING=i686-w64-mingw32-gcc-ar -DCMAKE_LD:STRING=i686-w64-mingw32-gcc-ld -DCMAKE_NM:STRING=i686-w64-mingw32-gcc-nm -DCMAKE_RANLIB:STRING=i686-w64-mingw32-gcc-ranlib"
+#CMAKE_LINKFLAG="-DCMAKE_EXE_LINKER_FLAGS:STRING=-s -flto=6 -O3 ${MAKEFLAGS_BASE} -fwhole-program"
+CMAKE_LINKFLAG="-DCMAKE_EXE_LINKER_FLAGS:STRING=-s"
+CMAKE_APPENDFLAG="-DCMAKE_AR:STRING=i686-w64-mingw32-gcc-ar -DCMAKE_LD:STRING=i686-w64-mingw32-gcc-ld -DCMAKE_NM:STRING=i686-w64-mingw32-gcc-nm -DCMAKE_RANLIB:STRING=i686-w64-mingw32-gcc-ranlib"
 
 
diff --git a/source/build-cmake/config_build_mingw.sh b/source/build-cmake/config_build_mingw.sh
index d78ca90f9..78d5a8f6e 100755
--- a/source/build-cmake/config_build_mingw.sh
+++ b/source/build-cmake/config_build_mingw.sh
@@ -65,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
@@ -76,7 +76,7 @@ case $? in
       ;;
       * ) exit $? ;;
 esac
-#mingw32-make clean
+mingw32-make clean
 cd ../..
 
 for SRCDATA in $@ ; do\
@@ -104,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
@@ -113,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
-- 
2.11.0