10 files changed, 27 insertions, 14 deletions
diff --git a/src/cmake/utils.cmake b/src/cmake/utils.cmake
index 742c40d43b..5f5be4b26a 100644
--- a/src/cmake/utils.cmake
+++ b/src/cmake/utils.cmake
@@ -69,10 +69,17 @@ MACRO(AZTH_SET_PATH name val)
 ENDMACRO()
 
 #
-# AZTH_ADD_SCRIPTS
+# AZTH_ADD_SCRIPT
 #
-MACRO(AZTH_ADD_SCRIPTS script_def include)
-    AZTH_ADD_GLOBAL("AZTH_ADD_SCRIPTS_LIST" "Add${script_def}Scripts()\;")
+MACRO(AZTH_ADD_SCRIPT path)
+    AZTH_ADD_GLOBAL("AZTH_SCRIPTS_SOURCES" "${path}")
+ENDMACRO()
+
+#
+# AZTH_ADD_SCRIPT_LOADER
+#
+MACRO(AZTH_ADD_SCRIPT_LOADER script_dec include)
+    AZTH_ADD_GLOBAL("AZTH_ADD_SCRIPTS_LIST" "Add${script_dec}Scripts()\;")
     
 
     if (NOT ${include} STREQUAL "")
diff --git a/src/server/scripts/CMakeLists.txt b/src/server/scripts/CMakeLists.txt
index 9d5261e666..f94a1395e0 100644
--- a/src/server/scripts/CMakeLists.txt
+++ b/src/server/scripts/CMakeLists.txt
@@ -30,9 +30,9 @@ set(scripts_STAT_SRCS
   ../game/AI/ScriptedAI/ScriptedFollowerAI.cpp
 )
 
-AZTH_ADD_SCRIPTS("Spell" "ScriptLoader.h")
-AZTH_ADD_SCRIPTS("SC_Smart" "ScriptLoader.h")
-AZTH_ADD_SCRIPTS("Command" "ScriptLoader.h")
+AZTH_ADD_SCRIPT_LOADER("Spell" "ScriptLoader.h")
+AZTH_ADD_SCRIPT_LOADER("SC_Smart" "ScriptLoader.h")
+AZTH_ADD_SCRIPT_LOADER("Command" "ScriptLoader.h")
 
 if(SCRIPTS)
   include(World/CMakeLists.txt)
@@ -48,6 +48,12 @@ endif()
 
 AZTH_GET_GLOBAL("AZTH_ADD_SCRIPTS_LIST")
 AZTH_GET_GLOBAL("AZTH_ADD_SCRIPTS_INCLUDE")
+AZTH_GET_GLOBAL("AZTH_SCRIPTS_SOURCES")
+
+set(scripts_STAT_SRCS
+  ${scripts_STAT_SRCS}
+  ${AZTH_SCRIPTS_SOURCES}
+)
 
 set("AZTH_SCRIPTS_INCLUDES" "")
 
diff --git a/src/server/scripts/EasternKingdoms/CMakeLists.txt b/src/server/scripts/EasternKingdoms/CMakeLists.txt
index 2ccc1001a8..c35560095f 100644
--- a/src/server/scripts/EasternKingdoms/CMakeLists.txt
+++ b/src/server/scripts/EasternKingdoms/CMakeLists.txt
@@ -164,6 +164,6 @@ set(scripts_STAT_SRCS
   EasternKingdoms/TheStockade/instance_the_stockade.cpp
 )
 
-AZTH_ADD_SCRIPTS("EasternKingdoms" "ScriptLoader.h")
+AZTH_ADD_SCRIPT_LOADER("EasternKingdoms" "ScriptLoader.h")
 
 message("  -> Prepared: Eastern Kingdoms")
diff --git a/src/server/scripts/Events/CMakeLists.txt b/src/server/scripts/Events/CMakeLists.txt
index 5f9c9aba2e..4dd982fa99 100644
--- a/src/server/scripts/Events/CMakeLists.txt
+++ b/src/server/scripts/Events/CMakeLists.txt
@@ -9,6 +9,6 @@ set(scripts_STAT_SRCS
   Events/midsummer.cpp
 )
 
-AZTH_ADD_SCRIPTS("Event" "ScriptLoader.h")
+AZTH_ADD_SCRIPT_LOADER("Event" "ScriptLoader.h")
 
 message("  -> Prepared: Events")
diff --git a/src/server/scripts/Kalimdor/CMakeLists.txt b/src/server/scripts/Kalimdor/CMakeLists.txt
index cd987796dd..42f071d26a 100644
--- a/src/server/scripts/Kalimdor/CMakeLists.txt
+++ b/src/server/scripts/Kalimdor/CMakeLists.txt
@@ -105,6 +105,6 @@ set(scripts_STAT_SRCS
   Kalimdor/DireMaul/dire_maul.h
 )
 
-AZTH_ADD_SCRIPTS("Kalimdor" "ScriptLoader.h")
+AZTH_ADD_SCRIPT_LOADER("Kalimdor" "ScriptLoader.h")
 
 message("  -> Prepared: Kalimdor")
diff --git a/src/server/scripts/Northrend/CMakeLists.txt b/src/server/scripts/Northrend/CMakeLists.txt
index 62d2f083b9..7da61ca050 100644
--- a/src/server/scripts/Northrend/CMakeLists.txt
+++ b/src/server/scripts/Northrend/CMakeLists.txt
@@ -196,6 +196,6 @@ set(scripts_STAT_SRCS
   Northrend/DraktharonKeep/boss_dred.cpp
 )
 
-AZTH_ADD_SCRIPTS("Northrend" "ScriptLoader.h")
+AZTH_ADD_SCRIPT_LOADER("Northrend" "ScriptLoader.h")
 
 message("  -> Prepared: Northrend")
diff --git a/src/server/scripts/OutdoorPvP/CMakeLists.txt b/src/server/scripts/OutdoorPvP/CMakeLists.txt
index dcdd6b30c0..4dd0808fbf 100644
--- a/src/server/scripts/OutdoorPvP/CMakeLists.txt
+++ b/src/server/scripts/OutdoorPvP/CMakeLists.txt
@@ -26,6 +26,6 @@ set(scripts_STAT_SRCS
   OutdoorPvP/OutdoorPvPGH.h
 )
 
-AZTH_ADD_SCRIPTS("OutdoorPvP" "ScriptLoader.h")
+AZTH_ADD_SCRIPT_LOADER("OutdoorPvP" "ScriptLoader.h")
 
 message("  -> Prepared: Outdoor PVP Zones")
diff --git a/src/server/scripts/Outland/CMakeLists.txt b/src/server/scripts/Outland/CMakeLists.txt
index 660aae1bb0..bcd579f877 100644
--- a/src/server/scripts/Outland/CMakeLists.txt
+++ b/src/server/scripts/Outland/CMakeLists.txt
@@ -109,6 +109,6 @@ set(scripts_STAT_SRCS
   Outland/zone_zangarmarsh.cpp
 )
 
-AZTH_ADD_SCRIPTS("Outland" "ScriptLoader.h")
+AZTH_ADD_SCRIPT_LOADER("Outland" "ScriptLoader.h")
 
 message("  -> Prepared: Outland")
diff --git a/src/server/scripts/Pet/CMakeLists.txt b/src/server/scripts/Pet/CMakeLists.txt
index b91af24a77..55adbb7127 100644
--- a/src/server/scripts/Pet/CMakeLists.txt
+++ b/src/server/scripts/Pet/CMakeLists.txt
@@ -18,6 +18,6 @@ set(scripts_STAT_SRCS
   Pet/pet_shaman.cpp
 )
 
-AZTH_ADD_SCRIPTS("Pet" "ScriptLoader.h")
+AZTH_ADD_SCRIPT_LOADER("Pet" "ScriptLoader.h")
 
 message("  -> Prepared: Pet")
diff --git a/src/server/scripts/World/CMakeLists.txt b/src/server/scripts/World/CMakeLists.txt
index 192a8f1564..dc4ce1e742 100644
--- a/src/server/scripts/World/CMakeLists.txt
+++ b/src/server/scripts/World/CMakeLists.txt
@@ -23,6 +23,6 @@ set(scripts_STAT_SRCS
   World/npcs_special.cpp
 )
 
-AZTH_ADD_SCRIPTS("World" "ScriptLoader.h")
+AZTH_ADD_SCRIPT_LOADER("World" "ScriptLoader.h")
 
 message("  -> Prepared: World")