diff options
| author | Yehonal <yehonal.azeroth@gmail.com> | 2016-08-11 20:10:08 +0200 |
|---|---|---|
| committer | Yehonal <yehonal.azeroth@gmail.com> | 2016-08-11 20:10:08 +0200 |
| commit | 991eed3b5a466c9bc913fea6ac84125233a4d3fd (patch) | |
| tree | afcbb004abc80ccadbe8f0f3573a06e7c65c0412 /bin/compiler | |
| parent | 4330b759b7c240998b56db3f13a91cf305ac6ad7 (diff) | |
Using more appropriate NS prefixes for our macro and cmake vars
Diffstat (limited to 'bin/compiler')
| -rw-r--r-- | bin/compiler/includes/functions.sh | 2 | ||||
| -rw-r--r-- | bin/compiler/includes/includes.sh | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/bin/compiler/includes/functions.sh b/bin/compiler/includes/functions.sh index d8fe078b99..03bb25e353 100644 --- a/bin/compiler/includes/functions.sh +++ b/bin/compiler/includes/functions.sh @@ -26,7 +26,7 @@ function configure() { #-DSCRIPTS_COMMANDS=$CSCRIPTS -DSCRIPTS_CUSTOM=$CSCRIPTS -DSCRIPTS_EASTERNKINGDOMS=$CSCRIPTS -DSCRIPTS_EVENTS=$CSCRIPTS -DSCRIPTS_KALIMDOR=$CSCRIPTS \ #-DSCRIPTS_NORTHREND=$CSCRIPTS -DSCRIPTS_OUTDOORPVP=$CSCRIPTS -DSCRIPTS_OUTLAND=$CSCRIPTS -DSCRIPTS_PET=$CSCRIPTS -DSCRIPTS_SPELLS=$CSCRIPTS -DSCRIPTS_WORLD=$CSCRIPTS \ - #-DAZTH_WITH_UNIT_TEST=$CAZTH_UNIT_TEST -DAZTH_WITH_PLUGINS=$CAZTH_PLG \ + #-DAC_WITH_UNIT_TEST=$CAC_UNIT_TEST -DAC_WITH_PLUGINS=$CAC_PLG \ cmake $SRCPATH -DCMAKE_INSTALL_PREFIX=$BINPATH -DCONF_DIR=$CONFDIR -DSERVERS=$CSERVERS \ -DSCRIPTS=$CSCRIPTS \ diff --git a/bin/compiler/includes/includes.sh b/bin/compiler/includes/includes.sh index 1396accb1f..a82ae32d6a 100644 --- a/bin/compiler/includes/includes.sh +++ b/bin/compiler/includes/includes.sh @@ -2,22 +2,22 @@ CURRENT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" source "$CURRENT_PATH/../../bash_shared/includes.sh" -AZTH_PATH_COMPILER="$AZTH_PATH_BIN/compiler" +AC_PATH_COMPILER="$AC_PATH_BIN/compiler" -if [ -f "$AZTH_PATH_COMPILER/config.sh" ]; then - source "$AZTH_PATH_COMPILER/config.sh" # should overwrite previous +if [ -f "$AC_PATH_COMPILER/config.sh" ]; then + source "$AC_PATH_COMPILER/config.sh" # should overwrite previous fi function azth_on_after_build() { # move the run engine - cp -rvf "$AZTH_PATH_BIN/runners/"* "$INSTALL_PATH/bin/" + cp -rvf "$AC_PATH_BIN/runners/"* "$INSTALL_PATH/bin/" } registerHooks "ON_AFTER_BUILD" azth_on_after_build -source "$AZTH_PATH_COMPILER/includes/defines.sh" +source "$AC_PATH_COMPILER/includes/defines.sh" -source "$AZTH_PATH_COMPILER/includes/functions.sh" +source "$AC_PATH_COMPILER/includes/functions.sh" mkdir -p $BUILDPATH mkdir -p $BINPATH |