diff options
| author | ShinDarth <borzifrancesco@gmail.com> | 2016-08-07 14:55:21 +0200 |
|---|---|---|
| committer | ShinDarth <borzifrancesco@gmail.com> | 2016-08-07 14:55:21 +0200 |
| commit | a7a81f90b191aeabebc768ff18807abf6d655a0c (patch) | |
| tree | 369c1e94a8270ac4a5ea60cfa14243bb6866f043 /bin/compiler/includes/functions.sh | |
| parent | b96f058c175657aa85047f4200196bdd952c9888 (diff) | |
| parent | 1fcfb9af5a0a8e4d308ec2ccda20adab99dce3ec (diff) | |
Merge branch 'master' into git
Diffstat (limited to 'bin/compiler/includes/functions.sh')
| -rw-r--r-- | bin/compiler/includes/functions.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/bin/compiler/includes/functions.sh b/bin/compiler/includes/functions.sh index ba268173fb..d8fe078b99 100644 --- a/bin/compiler/includes/functions.sh +++ b/bin/compiler/includes/functions.sh @@ -20,7 +20,7 @@ function configure() { echo "Build path: $BUILDPATH" echo "DEBUG info: $CDEBUG" - echo "Compilation type: $CCTYPE" + echo "Compilation type: $CTYPE" # -DCMAKE_BUILD_TYPE=$CCTYPE disable optimization "slow and huge amount of ram" # -DWITH_COREDEBUG=$CDEBUG compiled with debug information @@ -30,8 +30,8 @@ function configure() { cmake $SRCPATH -DCMAKE_INSTALL_PREFIX=$BINPATH -DCONF_DIR=$CONFDIR -DSERVERS=$CSERVERS \ -DSCRIPTS=$CSCRIPTS \ - -DTOOLS=$CTOOLS -DUSE_SCRIPTPCH=$CSCRIPTPCH -DUSE_COREPCH=$CCOREPCH -DWITH_COREDEBUG=$CDEBUG -DCMAKE_BUILD_TYPE=$CCTYPE -DWITH_WARNINGS=$CWARNINGS \ - -DCMAKE_C_COMPILER=$CCOMPILERC -DCMAKE_CXX_COMPILER=$CCOMPILERCXX + -DTOOLS=$CTOOLS -DUSE_SCRIPTPCH=$CSCRIPTPCH -DUSE_COREPCH=$CCOREPCH -DWITH_COREDEBUG=$CDEBUG -DCMAKE_BUILD_TYPE=$CTYPE -DWITH_WARNINGS=$CWARNINGS \ + -DCMAKE_C_COMPILER=$CCOMPILERC -DCMAKE_CXX_COMPILER=$CCOMPILERCXX $CCUSTOMOPTIONS cd $CWD |