[BUILD] Update batch files.

diff --git a/source/build-cmake/buildvars.dat b/source/build-cmake/buildvars.dat
index 296832d..250ccfb 100644 (file)
--- a/source/build-cmake/buildvars.dat
+++ b/source/build-cmake/buildvars.dat
@@ -15,7 +15,7 @@ USE_RADICAL_OPTIMIZE="Yes"
 # "No" or "Yes"
 USE_COMMON_DEVICE_LIB="Yes"
 # "No" or "Yes"
-USE_WHOLE_PROGRAM_OPTIMIZE="No"
+USE_WHOLE_PROGRAM_OPTIMIZE="Yes"
 
 ADDITIONAL_MAKEFLAGS_LINK_EXE=""
 ADDITIONAL_MAKEFLAGS_LINK_DLL=""
@@ -30,7 +30,7 @@ FFMPEG_DIR="/usr/include/x86_64-linux-gnu/"
 
 LIB_INSTALL="/usr/local/lib/x86_64-linux-gnu/"
 
-MAKEFLAGS_GENERAL="-j4"
+MAKEFLAGS_GENERAL="-j2"
 #MAKEFLAGS_BASE=""
 CMAKE_APPENDFLAG="${CMAKE_APPENDFLAG} -DUSE_MOVIE_SAVER=ON -DUSE_MOVIE_LOADER=ON"
 

diff --git a/source/build-cmake/buildvars_mingw_cross_win32.dat b/source/build-cmake/buildvars_mingw_cross_win32.dat
index 69bb0e4..3ab1366 100644 (file)
--- a/source/build-cmake/buildvars_mingw_cross_win32.dat
+++ b/source/build-cmake/buildvars_mingw_cross_win32.dat
@@ -20,6 +20,6 @@ ADDITIONAL_MAKEFLAGS_LINK_DLL=""
 ADDITIONAL_MAKEFLAGS_LINK_LIB=""
 
 FFMPEG_DIR="/usr/local/i586-mingw-msvc/ffmpeg-3.2"
-MAKEFLAGS_GENERAL="-j6"
+MAKEFLAGS_GENERAL="-j2"
 MAKEFLAGS_BASE=""
 

diff --git a/source/build-cmake/config_build.sh b/source/build-cmake/config_build.sh
index e460099..4fa5204 100755 (executable)
--- a/source/build-cmake/config_build.sh
+++ b/source/build-cmake/config_build.sh
@@ -181,7 +181,7 @@ for SRCDATA in $@ ; do\
       0 ) sudo make install 2>&1 | tee -a ./make.log ;;
       * ) 
            echo -e "Abort at `date --rfc-2822`." >> ../../${MAKE_STATUS_FILE}
-          exit ${_STATUS}
+          #exit ${_STATUS}
           ;;
     esac
     

diff --git a/source/build-cmake/config_build_cross_win32.sh b/source/build-cmake/config_build_cross_win32.sh
index e73e122..23bd955 100755 (executable)
--- a/source/build-cmake/config_build_cross_win32.sh
+++ b/source/build-cmake/config_build_cross_win32.sh
@@ -112,7 +112,7 @@ function build_dll() {
           ;;
      * ) 
          echo -e "Abort at `date --rfc-2822`." >> ../../${MAKE_STATUS_FILE}
-         exit ${_STATUS}
+         #exit ${_STATUS}
          ;;
     esac
     cd ../../
@@ -180,9 +180,9 @@ build_dll libCSPavio
 cp ./libCSPavio/build-win32/qt/avio/*.a   ./bin-win32/
 
 build_dll libCSPosd
-#cp ./libCSPosd/build-win32/qt/*.h   ./bin-win32/
-#cp ./libCSPosd/build-win32/qt/*.dll ./bin-win32/
-cp ./libCSPosd/build-win32/qt/*.a   ./bin-win32/
+#cp ./libCSPosd/build-win32/qt/osd/*.h   ./bin-win32/
+#cp ./libCSPosd/build-win32/qt/osd/*.dll ./bin-win32/
+cp ./libCSPosd/build-win32/qt/osd/*.a   ./bin-win32/
 
 build_dll libCSPgui
 cp ./libCSPgui/build-win32/qt/gui/*.h   ./bin-win32/
@@ -223,7 +223,7 @@ for SRCDATA in $@ ; do\
       0 ) cp ./qt/common/*.exe ../../bin-win32/ ;;
       * )
          echo -e "Abort at `date --rfc-2822`." >> ../../${MAKE_STATUS_FILE}
-         exit ${_STATUS}
+         #exit ${_STATUS}
          ;;
     esac
     
@@ -232,13 +232,12 @@ for SRCDATA in $@ ; do\
 done
 
 echo -e "End at `date --rfc-2822`." >> ../../${MAKE_STATUS_FILE}
-exit 0
 
-#for ii in libCSPavio libCSPgui libCSPosd libCSPemu_utils; do
-#    cd $ii/build-win32
-#    make clean
-#    cd ../..
-#done
+for ii in libCSPavio libCSPgui libCSPosd libCSPemu_utils; do
+    cd $ii/build-win32
+    make clean
+    cd ../..
+done
 
 exit 0