[BUILD] Update script.

diff --git a/source/build-cmake/buildvars.dat b/source/build-cmake/buildvars.dat
index 250ccfb..0c1d94c 100644 (file)
--- a/source/build-cmake/buildvars.dat
+++ b/source/build-cmake/buildvars.dat
@@ -1,7 +1,11 @@
 ###
 #
-#BUILD_TOOLCHAIN="LLVM"
+
 BUILD_TOOLCHAIN="GCC"
+CC_SUFFIX=7
+#BUILD_TOOLCHAIN="LLVM"
+#CC_SUFFIX=4.0
+
 
 BUILD_TYPE="Relwithdebinfo"
 # "No" or "Yes".
@@ -30,7 +34,7 @@ FFMPEG_DIR="/usr/include/x86_64-linux-gnu/"
 
 LIB_INSTALL="/usr/local/lib/x86_64-linux-gnu/"
 
-MAKEFLAGS_GENERAL="-j2"
+MAKEFLAGS_GENERAL="-j6"
 #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 3ab1366..5a3fa71 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="-j2"
+MAKEFLAGS_GENERAL="-j4"
 MAKEFLAGS_BASE=""
 

diff --git a/source/build-cmake/params/buildvars_linux_params_gcc.dat b/source/build-cmake/params/buildvars_linux_params_gcc.dat
index 77f7166..8f59845 100644 (file)
--- a/source/build-cmake/params/buildvars_linux_params_gcc.dat
+++ b/source/build-cmake/params/buildvars_linux_params_gcc.dat
@@ -6,6 +6,19 @@
 CCMAKE_CC=gcc
 CCMAKE_CXX=g++
 
+if [ -v CC_SUFFIX ] ; then
+   CCMAKE_CC=${CCMAKE_CC}-${CC_SUFFIX}
+   CCMAKE_CXX=${CCMAKE_CXX}-${CC_SUFFIX}
+fi
+if [ -v CC_PREFIX ] ; then
+   CCMAKE_CC=${CC_PREFIX}-${CCMAKE_CC}
+   CCMAKE_CXX=${CC_PREFIX}-${CCMAKE_CXX}
+fi
+if [ -v CC_PATH ] ; then
+   CCMAKE_CC=${CC_PATH}/${CCMAKE_CC}
+   CCMAKE_CXX=${CC_PATH}/${CCMAKE_CXX}
+fi
+
 case ${USE_RADICAL_OPTIMIZE} in
    "Yes" | "yes" | "YES" )
       MAKEFLAGS_BASE3=" \

diff --git a/source/build-cmake/params/buildvars_linux_params_llvm.dat b/source/build-cmake/params/buildvars_linux_params_llvm.dat
index 2d726dd..c546ba1 100644 (file)
--- a/source/build-cmake/params/buildvars_linux_params_llvm.dat
+++ b/source/build-cmake/params/buildvars_linux_params_llvm.dat
@@ -4,8 +4,21 @@
 # Neither for LLVM/MinGW and GCC.
 #
 ## CLANG
-CCMAKE_CC=clang-${LLVM_VERSION}
-CCMAKE_CXX=clang++-${LLVM_VERSION}
+CCMAKE_CC=clang
+CCMAKE_CXX=clang++
+
+if [ -v CC_SUFFIX ] ; then
+   CCMAKE_CC=${CCMAKE_CC}-${CC_SUFFIX}
+   CCMAKE_CXX=${CCMAKE_CXX}-${CC_SUFFIX}
+fi
+if [ -v CC_PREFIX ] ; then
+   CCMAKE_CC=${CC_PREFIX}-${CCMAKE_CC}
+   CCMAKE_CXX=${CC_PREFIX}-${CCMAKE_CXX}
+fi
+if [ -v CC_PATH ] ; then
+   CCMAKE_CC=${CC_PATH}/${CCMAKE_CC}
+   CCMAKE_CXX=${CC_PATH}/${CCMAKE_CXX}
+fi
 
 case ${CSP_DEBUG} in
    "Yes" | "yes" | "YES" )

diff --git a/source/build-cmake/params/buildvars_mingw_params_gcc.dat b/source/build-cmake/params/buildvars_mingw_params_gcc.dat
index 5735c93..4f3aa83 100644 (file)
--- a/source/build-cmake/params/buildvars_mingw_params_gcc.dat
+++ b/source/build-cmake/params/buildvars_mingw_params_gcc.dat
@@ -4,6 +4,7 @@
 # Neither for GCC/Linux and LLVM.
 #
 
+
 case ${CSP_DEBUG} in
    "Yes" | "yes" | "YES" )
      MAKEFLAGS_BASE2="-g -ggdb ${MAKEFLAGS_BASE} -DNDEBUG"