diff options
| author | Yehonal <yehonal.azeroth@gmail.com> | 2018-07-17 13:54:23 +0200 |
|---|---|---|
| committer | Yehonal <yehonal.azeroth@gmail.com> | 2018-07-17 13:54:23 +0200 |
| commit | af5256cd5b777e5db398bb9e1e4941893a5a06e4 (patch) | |
| tree | 8ded8f5440eaa427601e8d24a540fd318d7e0ff8 /apps/compiler/includes/functions.sh | |
| parent | 113ac069295f3de20ccbb5132f1e9b9448ae7341 (diff) | |
Various fixes to acore dashboard
+ simple restarter now prevents infinite crash loops
+ client data downloader now uses github releases and fixed downloading path
+ module updating now take care about compatibility version info
+ disabled CONFDIR variable in bash conf file, using BINPATH by default instead
Diffstat (limited to 'apps/compiler/includes/functions.sh')
| -rw-r--r-- | apps/compiler/includes/functions.sh | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/apps/compiler/includes/functions.sh b/apps/compiler/includes/functions.sh index 0275717ebc..92d2d7bdcd 100644 --- a/apps/compiler/includes/functions.sh +++ b/apps/compiler/includes/functions.sh @@ -28,7 +28,12 @@ function comp_configure() { #-DSCRIPTS_NORTHREND=$CSCRIPTS -DSCRIPTS_OUTDOORPVP=$CSCRIPTS -DSCRIPTS_OUTLAND=$CSCRIPTS -DSCRIPTS_PET=$CSCRIPTS -DSCRIPTS_SPELLS=$CSCRIPTS -DSCRIPTS_WORLD=$CSCRIPTS \ #-DAC_WITH_UNIT_TEST=$CAC_UNIT_TEST -DAC_WITH_PLUGINS=$CAC_PLG \ - cmake $SRCPATH -DCMAKE_INSTALL_PREFIX=$BINPATH -DCONF_DIR=$CONFDIR -DSERVERS=$CSERVERS \ + local DCONF="" + if [ ! -z "$CONFDIR" ]; then + DCONF="-DCONF_DIR=$CONFDIR" + fi + + cmake $SRCPATH -DCMAKE_INSTALL_PREFIX=$BINPATH $DCONF -DSERVERS=$CSERVERS \ -DSCRIPTS=$CSCRIPTS \ -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 "-DDISABLED_AC_MODULES=$CDISABLED_AC_MODULES" $CCUSTOMOPTIONS |