nchebrov/azerothcore-wotlk
1
0
Fork 0
mirror of https://github.com/mod-playerbots/azerothcore-wotlk.git synced 2026-01-28 16:16:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Using more appropriate NS prefixes for our macro and cmake vars

Browse Source
This commit is contained in:
Yehonal
2016-08-11 20:10:08 +02:00
parent 4330b759b7
commit 991eed3b5a
21 changed files with 106 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
bin/bash_shared/defines.sh
View File

@@ -1,7 +1,7 @@
AZTH_PATH_ROOT=$(readlink -f "$AZTH_PATH_BIN/../")
AC_PATH_ROOT=$(readlink -f "$AC_PATH_BIN/../")
AZTH_PATH_CONF="$AZTH_PATH_ROOT/conf"
AC_PATH_CONF="$AC_PATH_ROOT/conf"
AZTH_PATH_MODULES="$AZTH_PATH_ROOT/modules"
AC_PATH_MODULES="$AC_PATH_ROOT/modules"
AZTH_PATH_CUSTOM=$(readlink -f "$AZTH_PATH_ROOT/../azth_custom")
AC_PATH_CUSTOM=$(readlink -f "$AC_PATH_ROOT/../azth_custom")

16
bin/bash_shared/includes.sh
View File

@@ -1,22 +1,22 @@
AZTH_PATH_BIN="$( cd "$( dirname "${BASH_SOURCE[0]}" )/../" && pwd )"
AC_PATH_BIN="$( cd "$( dirname "${BASH_SOURCE[0]}" )/../" && pwd )"
AZTH_PATH_SHARED="$AZTH_PATH_BIN/bash_shared"
AC_PATH_SHARED="$AC_PATH_BIN/bash_shared"
source "$AZTH_PATH_SHARED/defines.sh"
source "$AC_PATH_SHARED/defines.sh"
source "$AZTH_PATH_SHARED/functions.sh"
source "$AC_PATH_SHARED/functions.sh"
source "$AZTH_PATH_CONF/config.sh.dist" # "hack" to avoid missing conf variables
source "$AC_PATH_CONF/config.sh.dist" # "hack" to avoid missing conf variables
if [ -f "$AZTH_PATH_CONF/config.sh" ]; then
source "$AZTH_PATH_CONF/config.sh" # should overwrite previous
if [ -f "$AC_PATH_CONF/config.sh" ]; then
source "$AC_PATH_CONF/config.sh" # should overwrite previous
fi
#
# Load modules
#
for entry in "$AZTH_PATH_MODULES/"*/include.sh
for entry in "$AC_PATH_MODULES/"*/include.sh
do
if [ -e $entry ]; then
source $entry