Using more appropriate NS prefixes for our macro and cmake vars

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

View File

@@ -109,4 +109,4 @@ if (USE_COREPCH)
add_cxx_pch(authserver ${authserver_PCH_HDR} ${authserver_PCH_SRC})
endif()
RUN_HOOK("AFTER_AUTHSERVER_CMAKE")
CU_RUN_HOOK("AFTER_AUTHSERVER_CMAKE")

View File

@@ -8,7 +8,7 @@
# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
RUN_HOOK(BEFORE_GAME_LIBRARY)
CU_RUN_HOOK(BEFORE_GAME_LIBRARY)
file(GLOB_RECURSE sources_Accounts Accounts/*.cpp Accounts/*.h)
file(GLOB_RECURSE sources_Achievements Achievements/*.cpp Achievements/*.h)
@@ -224,4 +224,4 @@ if (USE_COREPCH)
add_cxx_pch(game ${game_STAT_PCH_HDR} ${game_STAT_PCH_SRC})
endif ()
RUN_HOOK(AFTER_GAME_LIBRARY)
CU_RUN_HOOK(AFTER_GAME_LIBRARY)

View File

@@ -30,9 +30,9 @@ set(scripts_STAT_SRCS
../game/AI/ScriptedAI/ScriptedFollowerAI.cpp
)
AZTH_ADD_SCRIPT_LOADER("Spell" "ScriptLoader.h")
AZTH_ADD_SCRIPT_LOADER("SC_Smart" "ScriptLoader.h")
AZTH_ADD_SCRIPT_LOADER("Command" "ScriptLoader.h")
AC_ADD_SCRIPT_LOADER("Spell" "ScriptLoader.h")
AC_ADD_SCRIPT_LOADER("SC_Smart" "ScriptLoader.h")
AC_ADD_SCRIPT_LOADER("Command" "ScriptLoader.h")
if(SCRIPTS)
include(World/CMakeLists.txt)
@@ -46,19 +46,19 @@ if(SCRIPTS)
endif()
AZTH_GET_GLOBAL("AZTH_ADD_SCRIPTS_LIST")
AZTH_GET_GLOBAL("AZTH_ADD_SCRIPTS_INCLUDE")
AZTH_GET_GLOBAL("AZTH_SCRIPTS_SOURCES")
CU_GET_GLOBAL("AC_ADD_SCRIPTS_LIST")
CU_GET_GLOBAL("AC_ADD_SCRIPTS_INCLUDE")
CU_GET_GLOBAL("AC_SCRIPTS_SOURCES")
set(scripts_STAT_SRCS
${scripts_STAT_SRCS}
${AZTH_SCRIPTS_SOURCES}
${AC_SCRIPTS_SOURCES}
)
set("AZTH_SCRIPTS_INCLUDES" "")
set("AC_SCRIPTS_INCLUDES" "")
FOREACH (include ${AZTH_ADD_SCRIPTS_INCLUDE})
set("AZTH_SCRIPTS_INCLUDES" "#include \"${include}\"\n${AZTH_SCRIPTS_INCLUDES}")
FOREACH (include ${AC_ADD_SCRIPTS_INCLUDE})
set("AC_SCRIPTS_INCLUDES" "#include \"${include}\"\n${AC_SCRIPTS_INCLUDES}")
ENDFOREACH()
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/GenLoader.cpp.cmake ${BUILDDIR}/GenLoader.cpp)

View File

@@ -164,6 +164,6 @@ set(scripts_STAT_SRCS
EasternKingdoms/TheStockade/instance_the_stockade.cpp
)
AZTH_ADD_SCRIPT_LOADER("EasternKingdoms" "ScriptLoader.h")
AC_ADD_SCRIPT_LOADER("EasternKingdoms" "ScriptLoader.h")
message(" -> Prepared: Eastern Kingdoms")

View File

@@ -9,6 +9,6 @@ set(scripts_STAT_SRCS
Events/midsummer.cpp
)
AZTH_ADD_SCRIPT_LOADER("Event" "ScriptLoader.h")
AC_ADD_SCRIPT_LOADER("Event" "ScriptLoader.h")
message(" -> Prepared: Events")

View File

@@ -1,7 +1,7 @@
// This file is autogenerated, please do not modify directly!
@AZTH_SCRIPTS_INCLUDES@
@AC_SCRIPTS_INCLUDES@
void AddScripts() {
@AZTH_ADD_SCRIPTS_LIST@
@AC_ADD_SCRIPTS_LIST@
}

View File

@@ -105,6 +105,6 @@ set(scripts_STAT_SRCS
Kalimdor/DireMaul/dire_maul.h
)
AZTH_ADD_SCRIPT_LOADER("Kalimdor" "ScriptLoader.h")
AC_ADD_SCRIPT_LOADER("Kalimdor" "ScriptLoader.h")
message(" -> Prepared: Kalimdor")

View File

@@ -196,6 +196,6 @@ set(scripts_STAT_SRCS
Northrend/DraktharonKeep/boss_dred.cpp
)
AZTH_ADD_SCRIPT_LOADER("Northrend" "ScriptLoader.h")
AC_ADD_SCRIPT_LOADER("Northrend" "ScriptLoader.h")
message(" -> Prepared: Northrend")

View File

@@ -26,6 +26,6 @@ set(scripts_STAT_SRCS
OutdoorPvP/OutdoorPvPGH.h
)
AZTH_ADD_SCRIPT_LOADER("OutdoorPvP" "ScriptLoader.h")
AC_ADD_SCRIPT_LOADER("OutdoorPvP" "ScriptLoader.h")
message(" -> Prepared: Outdoor PVP Zones")

View File

@@ -109,6 +109,6 @@ set(scripts_STAT_SRCS
Outland/zone_zangarmarsh.cpp
)
AZTH_ADD_SCRIPT_LOADER("Outland" "ScriptLoader.h")
AC_ADD_SCRIPT_LOADER("Outland" "ScriptLoader.h")
message(" -> Prepared: Outland")

View File

@@ -18,6 +18,6 @@ set(scripts_STAT_SRCS
Pet/pet_shaman.cpp
)
AZTH_ADD_SCRIPT_LOADER("Pet" "ScriptLoader.h")
AC_ADD_SCRIPT_LOADER("Pet" "ScriptLoader.h")
message(" -> Prepared: Pet")

View File

@@ -23,6 +23,6 @@ set(scripts_STAT_SRCS
World/npcs_special.cpp
)
AZTH_ADD_SCRIPT_LOADER("World" "ScriptLoader.h")
AC_ADD_SCRIPT_LOADER("World" "ScriptLoader.h")
message(" -> Prepared: World")

View File

@@ -209,4 +209,4 @@ if( USE_COREPCH )
add_cxx_pch(worldserver ${worldserver_PCH_HDR} ${worldserver_PCH_SRC})
endif()
RUN_HOOK("AFTER_WORLDSERVER_CMAKE")
CU_RUN_HOOK("AFTER_WORLDSERVER_CMAKE")