From 5ead53a1ed680353ecc250f5c1442771b039ce70 Mon Sep 17 00:00:00 2001 From: schnek Date: Sat, 8 Jul 2023 05:14:06 -0800 Subject: [PATCH] Fix SRC_TBC_SHADOWLABYRINTH_SCRIPTS_FILES (not added) (#1110) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Fix SRC_TBC_SHADOWLABYRINTH_SCRIPTS_FILES (not added) fix Installing ./libmysql.lib Delete USE_PCH_INCLUDES Revert unset() language version must be global 😉 * Update CheckSystem.cmake --- .gitignore | 21 +++- CMakeLists.txt | 23 +--- cmake/CheckSystem.cmake | 38 ++++-- cmake/Compilers/clang.cmake | 4 +- cmake/Compilers/gcc.cmake | 4 +- cmake/Options.cmake | 4 - cmake/Systems/Windows.cmake | 18 ++- dep/bzip2/CMakeLists.txt | 2 + dep/dbcfile/CMakeLists.txt | 2 + dep/g3dlite/CMakeLists.txt | 3 +- dep/libmpq/CMakeLists.txt | 2 + dep/loadlib/CMakeLists.txt | 2 + dep/lualib/src/CMakeLists.txt | 8 +- dep/recastnavigation/Detour/CMakeLists.txt | 2 + dep/recastnavigation/Recast/CMakeLists.txt | 1 + dep/utf8cpp/CMakeLists.txt | 5 +- dep/zlib/CMakeLists.txt | 2 + src/logonserver/Auth/AuthSocket.Legacy.cpp | 1 + src/logonserver/CMakeLists.txt | 19 ++- src/scripts/Battlegrounds/CMakeLists.txt | 8 +- src/scripts/EventScripts/CMakeLists.txt | 8 +- src/scripts/ExtraScripts/CMakeLists.txt | 7 +- src/scripts/GossipScripts/CMakeLists.txt | 7 +- src/scripts/InstanceScripts/CMakeLists.txt | 12 +- src/scripts/LuaEngine/CMakeLists.txt | 6 +- src/scripts/LuaEngine/LUAEngine.cpp | 12 +- src/scripts/MiscScripts/CMakeLists.txt | 6 +- src/scripts/QuestScripts/CMakeLists.txt | 6 +- src/scripts/SpellHandlers/CMakeLists.txt | 5 +- .../SpellHandlers/LegacyFiles/CMakeLists.txt | 1 + .../SpellHandlers/Scripts/CMakeLists.txt | 1 + src/shared/CMakeLists.txt | 4 +- .../ToolsCataMop/map_extractor/CMakeLists.txt | 2 + .../mmaps_generator/CMakeLists.txt | 4 +- .../vmap_tools/vmap4_assembler/CMakeLists.txt | 2 + .../vmap_tools/vmap4_extractor/CMakeLists.txt | 2 + src/tools/map_extractor/CMakeLists.txt | 2 + src/tools/mmaps_generator/CMakeLists.txt | 4 +- .../vmap_tools/vmap4_assembler/CMakeLists.txt | 2 + .../vmap_tools/vmap4_extractor/CMakeLists.txt | 2 + src/world/CMakeLists.txt | 117 +++++++++++------- src/world/GameCata/Storage/CMakeLists.txt | 13 -- src/world/GameClassic/Storage/CMakeLists.txt | 12 -- src/world/GameMop/Storage/CMakeLists.txt | 13 -- src/world/GameTBC/Storage/CMakeLists.txt | 12 -- src/world/GameWotLK/Storage/CMakeLists.txt | 12 -- .../Packets/Handlers/CalendarHandler.cpp | 4 +- src/world/Storage/DBC/CMakeLists.txt | 19 --- src/world/WorldConf.h.in | 3 - 49 files changed, 228 insertions(+), 241 deletions(-) delete mode 100644 src/world/GameCata/Storage/CMakeLists.txt delete mode 100644 src/world/GameClassic/Storage/CMakeLists.txt delete mode 100644 src/world/GameMop/Storage/CMakeLists.txt delete mode 100644 src/world/GameTBC/Storage/CMakeLists.txt delete mode 100644 src/world/GameWotLK/Storage/CMakeLists.txt delete mode 100644 src/world/Storage/DBC/CMakeLists.txt diff --git a/.gitignore b/.gitignore index a76e4d4c0..88b2840e9 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,4 @@ -.aps +*.aps .idea .TMP .DS_Store @@ -16,10 +16,21 @@ src/world/WorldConf.h CMakeLists.txt.user #config files -configs/logon.conf -configs/optional.conf -configs/realms.conf -configs/world.conf +configs/*.conf /cmake-build-debug/ cmake-build-* /build*/ +CMakeFiles +*/Makefile +*/*/Makefile +*/*/*/Makefile +*/*/*/cmake_install.cmake +*/*/cmake_install.cmake +cmake_install.cmake +CMakeCache.txt +Makefile +bin/lib/*.a +*.a +bin/*.so +bin/* + diff --git a/CMakeLists.txt b/CMakeLists.txt index 09a253263..7b14fd8ba 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,30 +3,11 @@ cmake_minimum_required(VERSION 3.16.3) project(Ascemu) -# set runtime binary where all compiled (before install) binary will compiled in -set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin) - -# set build type on unix if it wasn't defined by user -if (UNIX) - if (NOT CMAKE_BUILD_TYPE) - message(STATUS "Build configuration was not detected, setting to \"Release\"") - set(CMAKE_BUILD_TYPE "Release") - else () - message(STATUS "Detected ${CMAKE_BUILD_TYPE} configuration") - endif () - - if (CMAKE_SYSTEM_NAME STREQUAL "FreeBSD" OR CMAKE_SYSTEM_NAME STREQUAL "kFreeBSD") - set(CMAKE_CXX_LINK_FLAGS "${CMAKE_CXX_LINK_FLAGS} -lc++experimental") - elseif (APPLE) - set(CMAKE_CXX_LINK_FLAGS "${CMAKE_CXX_LINK_FLAGS} -lc++") - endif () -endif () - # cmake options -include(${CMAKE_SOURCE_DIR}/cmake/Options.cmake) +include(cmake/Options.cmake) # perform system tasks -include(${CMAKE_SOURCE_DIR}/cmake/CheckSystem.cmake) +include(cmake/CheckSystem.cmake) # add dependecies add_subdirectory(dep) diff --git a/cmake/CheckSystem.cmake b/cmake/CheckSystem.cmake index 4d53f1b65..3ce88060e 100644 --- a/cmake/CheckSystem.cmake +++ b/cmake/CheckSystem.cmake @@ -1,29 +1,49 @@ # Copyright (c) 2014-2023 AscEmu Team include_guard(GLOBAL) +set(CMAKE_CXX_STANDARD 20) +set(CMAKE_CXX_STANDARD_REQUIRED ON) + # correctly switches from -std=gnu++2a to -std=c++2a. set(CXX_EXTENSIONS OFF) -set(CMAKE_CXX_STANDARD_REQUIRED ON) -set(CMAKE_CXX_STANDARD 20) +# set runtime binary where all compiled (before install) binary will compiled in +set(CMAKE_LIBRARY_OUTPUT_DIRECTORY_DEBUG ${CMAKE_BINARY_DIR}/bin) +set(CMAKE_LIBRARY_OUTPUT_DIRECTORY_RELEASE ${CMAKE_BINARY_DIR}/bin) +set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG ${CMAKE_BINARY_DIR}/bin) +set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE ${CMAKE_BINARY_DIR}/bin) +set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY_DEBUG ${CMAKE_BINARY_DIR}/bin/lib) +set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY_RELEASE ${CMAKE_BINARY_DIR}/bin/lib) + +# we have our own custom modules and dep modules that we use. This tells cmakes where to find them. +set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/Modules ${CMAKE_MODULE_PATH}) + +# set build type on unix if it wasn't defined by user +if (UNIX) + if(NOT CMAKE_BUILD_TYPE) + set(CMAKE_BUILD_TYPE "Release" CACHE STRING "Choose Release or Debug" FORCE) + endif() + + if (CMAKE_SYSTEM_NAME STREQUAL "FreeBSD" OR CMAKE_SYSTEM_NAME STREQUAL "kFreeBSD") + set(CMAKE_CXX_LINK_FLAGS "${CMAKE_CXX_LINK_FLAGS} -lc++experimental") + elseif (APPLE) + set(CMAKE_CXX_LINK_FLAGS "${CMAKE_CXX_LINK_FLAGS} -lc++") + endif () +endif () # set RPATH-handing (CMake parameters) set(CMAKE_SKIP_BUILD_RPATH FALSE) set(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE) set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) -# we have our own custom modules and dep modules that we use. This tells cmakes where to find them. -list(APPEND CMAKE_MODULE_PATH - ${CMAKE_SOURCE_DIR}/cmake/Modules) - # get git information -include(${CMAKE_SOURCE_DIR}/cmake/Modules/AEGitRevision.cmake) +include(${CMAKE_MODULE_PATH}/AEGitRevision.cmake) # apply options settings -include(${CMAKE_SOURCE_DIR}/cmake/Modules/AEConfigureFiles.cmake) +include(${CMAKE_MODULE_PATH}/AEConfigureFiles.cmake) # get architecture type and set architecture identifier -include(${CMAKE_SOURCE_DIR}/cmake/Modules/AEConfigureArch.cmake) +include(${CMAKE_MODULE_PATH}/AEConfigureArch.cmake) # default definitions # -DPREFIX=\"${ASCEMU_SCRIPTLIB_PATH}\" diff --git a/cmake/Compilers/clang.cmake b/cmake/Compilers/clang.cmake index 7d9e0f82f..acedb53e0 100644 --- a/cmake/Compilers/clang.cmake +++ b/cmake/Compilers/clang.cmake @@ -14,8 +14,8 @@ message(STATUS "Applying settings for ${CMAKE_CXX_COMPILER}") # check support for unordered_map/set add_definitions(-DHAS_CXX0X) -# apply base flags -add_compile_options(-O2 -std=c++2a) +# apply base flags (optimization level 2) +add_compile_options(-O2) if (IS_64BIT) add_compile_options(-fPIC) diff --git a/cmake/Compilers/gcc.cmake b/cmake/Compilers/gcc.cmake index a9408f99d..83736bb1c 100644 --- a/cmake/Compilers/gcc.cmake +++ b/cmake/Compilers/gcc.cmake @@ -14,8 +14,8 @@ message(STATUS "Applying settings for ${CMAKE_CXX_COMPILER}") # check support for unordered_map/set add_definitions(-DHAS_CXX0X) -# apply base flags -add_compile_options(-O2 -std=c++2a) +# apply base flags (optimization level 2) +add_compile_options(-O2) if (IS_64BIT) add_compile_options(-fPIC) diff --git a/cmake/Options.cmake b/cmake/Options.cmake index 2dde69bd5..ccacc441e 100644 --- a/cmake/Options.cmake +++ b/cmake/Options.cmake @@ -1,10 +1,6 @@ # Copyright (c) 2014-2023 AscEmu Team include_guard(GLOBAL) -if (NOT USE_PCH) - set(ASCEMU_COMMENT_PCH //) -endif () - set(ASCEMU_CONFIGSFILE_PATH "configs" CACHE PATH "The directory for AscEmu configs.") set(ASCEMU_SCRIPTLIB_PATH "modules" CACHE PATH "The directory for AscEmu modules.") diff --git a/cmake/Systems/Windows.cmake b/cmake/Systems/Windows.cmake index 0165fe42a..a3b287e41 100644 --- a/cmake/Systems/Windows.cmake +++ b/cmake/Systems/Windows.cmake @@ -11,22 +11,20 @@ find_package(MySQL) find_package(OpenSSL) # needed for socket stuff and crash handler -set(EXTRA_LIBS - ${EXTRA_LIBS} +set(EXTRA_LIBS ws2_32.lib dbghelp.lib ) -# install libraries for windows build (libmysql.dll) -install(FILES ${INSTALLED_DEPENDENCIES} DESTINATION .) - -# check for db update files -set(PATH_DB_FILES ${CMAKE_SOURCE_DIR}/sql/) - -set(INSTALL_DB_FILES ${PATH_DB_FILES}) - if (MSVC) include(${CMAKE_SOURCE_DIR}/cmake/Compilers/msvc.cmake) else () message(FATAL_ERROR "Compiler is not supported") endif () + +# check for db update files +set(PATH_DB_FILES ${CMAKE_SOURCE_DIR}/sql/) +set(INSTALL_DB_FILES ${PATH_DB_FILES}) + +# install libraries for windows build (libmysql.dll) +install(FILES ${MYSQL_DLL} DESTINATION .) diff --git a/dep/bzip2/CMakeLists.txt b/dep/bzip2/CMakeLists.txt index a3c3924b6..aa60adf57 100644 --- a/dep/bzip2/CMakeLists.txt +++ b/dep/bzip2/CMakeLists.txt @@ -18,3 +18,5 @@ add_library(${PROJECT_NAME} STATIC ${SRC_BZIP2}) set(BZIP2_LIBRARIES ${PROJECT_NAME} CACHE INTERNAL "Bzip2 libraries." FORCE) set(BZIP2_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR} CACHE INTERNAL "Bzip2 include dirs." FORCE) + +unset(SRC_BZIP2) diff --git a/dep/dbcfile/CMakeLists.txt b/dep/dbcfile/CMakeLists.txt index c218aef22..f392aa798 100644 --- a/dep/dbcfile/CMakeLists.txt +++ b/dep/dbcfile/CMakeLists.txt @@ -21,3 +21,5 @@ target_link_libraries(${PROJECT_NAME} loadlib libmpq ) + +unset(SRC_DBCFILE) diff --git a/dep/g3dlite/CMakeLists.txt b/dep/g3dlite/CMakeLists.txt index 080e1a995..fe8cebd87 100644 --- a/dep/g3dlite/CMakeLists.txt +++ b/dep/g3dlite/CMakeLists.txt @@ -60,5 +60,6 @@ add_library(${PROJECT_NAME} STATIC ${SRC_G3DLITE}) target_link_libraries(${PROJECT_NAME} PUBLIC ${ZLIB_LIBRARIES} - ${CMAKE_THREAD_LIBS_INIT} ) + +unset(SRC_G3DLITE) diff --git a/dep/libmpq/CMakeLists.txt b/dep/libmpq/CMakeLists.txt index cfabd1592..671fb83e2 100644 --- a/dep/libmpq/CMakeLists.txt +++ b/dep/libmpq/CMakeLists.txt @@ -35,3 +35,5 @@ target_link_libraries(${PROJECT_NAME} ${ZLIB_LIBRARIES} ${BZIP2_LIBRARIES} ) + +unset(LIBMPQ_SRCS) diff --git a/dep/loadlib/CMakeLists.txt b/dep/loadlib/CMakeLists.txt index 720429ddf..ea2a3d204 100644 --- a/dep/loadlib/CMakeLists.txt +++ b/dep/loadlib/CMakeLists.txt @@ -22,3 +22,5 @@ target_link_libraries(${PROJECT_NAME} PUBLIC libmpq ) + +unset(LOADLIB_SRCS) diff --git a/dep/lualib/src/CMakeLists.txt b/dep/lualib/src/CMakeLists.txt index 0a67f4e4c..2b4807206 100644 --- a/dep/lualib/src/CMakeLists.txt +++ b/dep/lualib/src/CMakeLists.txt @@ -11,7 +11,13 @@ file(GLOB LUALIB_SOURCES "lua/*.c" ) +set(LUALIB_SRCS + ${LUALIB_SOURCES} +) + include_directories(${CMAKE_CURRENT_SOURCE_DIR}) # lua static library -add_library (${PROJECT_NAME} STATIC ${LUALIB_SOURCES}) +add_library (${PROJECT_NAME} STATIC ${LUALIB_SRCS}) + +unset(LUALIB_SRCS) diff --git a/dep/recastnavigation/Detour/CMakeLists.txt b/dep/recastnavigation/Detour/CMakeLists.txt index fdd30e0b6..1e2f37566 100644 --- a/dep/recastnavigation/Detour/CMakeLists.txt +++ b/dep/recastnavigation/Detour/CMakeLists.txt @@ -21,3 +21,5 @@ target_link_libraries(${PROJECT_NAME} PUBLIC ${ZLIB_LIBRARIES} ) + +unset(SRC_DETOUR) diff --git a/dep/recastnavigation/Recast/CMakeLists.txt b/dep/recastnavigation/Recast/CMakeLists.txt index b0b9afa75..b3dff50c4 100644 --- a/dep/recastnavigation/Recast/CMakeLists.txt +++ b/dep/recastnavigation/Recast/CMakeLists.txt @@ -22,3 +22,4 @@ target_link_libraries(${PROJECT_NAME} ${ZLIB_LIBRARIES} ) +unset(RECAST_SRCS) \ No newline at end of file diff --git a/dep/utf8cpp/CMakeLists.txt b/dep/utf8cpp/CMakeLists.txt index 925c0027b..16f994603 100644 --- a/dep/utf8cpp/CMakeLists.txt +++ b/dep/utf8cpp/CMakeLists.txt @@ -2,4 +2,7 @@ add_library(utf8cpp INTERFACE) -target_include_directories(utf8cpp INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}) +target_include_directories(utf8cpp + INTERFACE + ${CMAKE_CURRENT_SOURCE_DIR} +) diff --git a/dep/zlib/CMakeLists.txt b/dep/zlib/CMakeLists.txt index 2c04ae679..63205c3b8 100644 --- a/dep/zlib/CMakeLists.txt +++ b/dep/zlib/CMakeLists.txt @@ -29,3 +29,5 @@ add_library(${PROJECT_NAME} STATIC ${SRC_ZLIB}) #set it to the project name. set(ZLIB_LIBRARIES ${PROJECT_NAME} CACHE INTERNAL "Zlib Libraries") set(ZLIB_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR} CACHE INTERNAL "Zlib include dir" FORCE) + +unset(SRC_ZLIB) diff --git a/src/logonserver/Auth/AuthSocket.Legacy.cpp b/src/logonserver/Auth/AuthSocket.Legacy.cpp index 66efe0376..d1237f66d 100644 --- a/src/logonserver/Auth/AuthSocket.Legacy.cpp +++ b/src/logonserver/Auth/AuthSocket.Legacy.cpp @@ -692,6 +692,7 @@ void AuthSocket::HandleReconnectChallenge() MD5_Update(&ctx, m_account->SessionKey, 40); uint8 buffer[20]; MD5_Final(buffer, &ctx); + ByteBuffer buf; buf << uint16(2); buf.append(buffer, 20); diff --git a/src/logonserver/CMakeLists.txt b/src/logonserver/CMakeLists.txt index ea8a7b219..7af0b3a43 100644 --- a/src/logonserver/CMakeLists.txt +++ b/src/logonserver/CMakeLists.txt @@ -11,7 +11,7 @@ file(GLOB SRC_SERVER_FILES Server/*.cpp Server/*.h Server/*.hpp) file(GLOB SRC_LOCAL_DIR *.cpp *.h *.hpp) if (WIN32) - set(SRC_LOGON_PROJECT ${SRC_LOGON_PROJECT} ${CMAKE_CURRENT_SOURCE_DIR}/resources.rc) + set(APP_ICON_RESOURCE_WINDOWS "${CMAKE_CURRENT_SOURCE_DIR}/resources.rc") endif () set(LOGON_SRCS @@ -20,7 +20,6 @@ set(LOGON_SRCS ${SRC_LOGON_COMM_SERVER_FILES} ${SRC_REALM_FILES} ${SRC_SERVER_FILES} - ${SRC_LOGON_PROJECT} ${SRC_LOCAL_DIR} ) @@ -29,22 +28,18 @@ include_directories( ${CMAKE_SOURCE_DIR}/src/shared ${ZLIB_INCLUDE_DIRS} ${OPENSSL_INCLUDE_DIR} - ${PCRE_INCLUDE_DIR} ${MYSQL_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ) # source group. -source_group(logon FILES ${SRC_LOGON_PROJECT}) source_group(Auth FILES ${SRC_AUTH_FILES}) source_group(Console FILES ${SRC_CONSOLE_FILES}) source_group(LogonCommServer FILES ${SRC_LOGON_COMM_SERVER_FILES}) source_group(Realm FILES ${SRC_REALM_FILES}) source_group(Server FILES ${SRC_SERVER_FILES}) -link_directories(${EXTRA_LIBS_PATH} ${DEPENDENCY_LIBS}) - -add_executable(${PROJECT_NAME} ${LOGON_SRCS}) +add_executable(${PROJECT_NAME} ${LOGON_SRCS} ${APP_ICON_RESOURCE_WINDOWS}) if (APPLE) target_link_libraries(${PROJECT_NAME} c++) @@ -58,16 +53,16 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/LogonConf.hpp.in ${CMAKE_CURRENT_SOUR target_link_libraries(${PROJECT_NAME} PUBLIC shared - ${MYSQL_LIBRARIES} ${ZLIB_LIBRARIES} - ${PCRE_LIBRARIES} ) -# provide make install rules. -install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION .) - # generate precompiled header. if (USE_PCH) message(STATUS "Generate PCH for ${PROJECT_NAME}") target_precompile_headers(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/pchLogon.hpp) endif () + +# provide make install rules. +install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION .) + +unset(LOGON_SRCS) diff --git a/src/scripts/Battlegrounds/CMakeLists.txt b/src/scripts/Battlegrounds/CMakeLists.txt index 658b5ba35..04af73761 100644 --- a/src/scripts/Battlegrounds/CMakeLists.txt +++ b/src/scripts/Battlegrounds/CMakeLists.txt @@ -23,7 +23,6 @@ set(SRC_BATTLEGROUNDS ) set(BATTLEGROUNDS_SRCS - ${BATTLEGROUNDS_SRCS} ${SRC_ALTERAC_VALLEY} ${SRC_ARATHI_BASIN} ${SRC_CIRCLE_OF_BLOOD} @@ -41,7 +40,6 @@ set(BATTLEGROUNDS_SRCS include_directories( ${OPENSSL_INCLUDE_DIR} - ${PCRE_INCLUDE_DIR} ${CMAKE_SOURCE_DIR}/dep/recastnavigation/Detour/Include ${CMAKE_SOURCE_DIR}/src/collision ${CMAKE_SOURCE_DIR}/src/collision/Management @@ -75,10 +73,12 @@ target_link_libraries(${PROJECT_NAME} world ) -install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION ${ASCEMU_SCRIPTLIB_PATH} LIBRARY DESTINATION ${ASCEMU_SCRIPTLIB_PATH}) - # generate precompiled header. if (USE_PCH) message(STATUS "Generate PCH for ${PROJECT_NAME}") target_precompile_headers(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/pchBattleGrounds.hpp) endif () + +install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION ${ASCEMU_SCRIPTLIB_PATH} LIBRARY DESTINATION ${ASCEMU_SCRIPTLIB_PATH}) + +unset(BATTLEGROUNDS_SRCS) diff --git a/src/scripts/EventScripts/CMakeLists.txt b/src/scripts/EventScripts/CMakeLists.txt index 312569359..b684b7c11 100644 --- a/src/scripts/EventScripts/CMakeLists.txt +++ b/src/scripts/EventScripts/CMakeLists.txt @@ -18,14 +18,12 @@ set(SRC_EVENTSCRIPTS ) set(EVENTSCRIPTS_SRCS - ${EVENTSCRIPTS_SRCS} ${SRC_EVENTSCRIPTS} ${SRC_LOCAL_DIR} ) include_directories( ${OPENSSL_INCLUDE_DIR} - ${PCRE_INCLUDE_DIR} ${CMAKE_SOURCE_DIR}/dep/recastnavigation/Detour/Include ${CMAKE_SOURCE_DIR}/src/collision ${CMAKE_SOURCE_DIR}/src/collision/Management @@ -47,10 +45,12 @@ target_link_libraries(${PROJECT_NAME} world ) -install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION ${ASCEMU_SCRIPTLIB_PATH} LIBRARY DESTINATION ${ASCEMU_SCRIPTLIB_PATH}) - # generate precompiled header. if (USE_PCH) message(STATUS "Generate PCH for ${PROJECT_NAME}") target_precompile_headers(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/pchEventScripts.hpp) endif () + +install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION ${ASCEMU_SCRIPTLIB_PATH} LIBRARY DESTINATION ${ASCEMU_SCRIPTLIB_PATH}) + +unset(EVENTSCRIPTS_SRCS) diff --git a/src/scripts/ExtraScripts/CMakeLists.txt b/src/scripts/ExtraScripts/CMakeLists.txt index 5e7b20112..c14cec746 100644 --- a/src/scripts/ExtraScripts/CMakeLists.txt +++ b/src/scripts/ExtraScripts/CMakeLists.txt @@ -22,7 +22,6 @@ set(EXTRASCRIPTS_SRCS include_directories( ${OPENSSL_INCLUDE_DIR} - ${PCRE_INCLUDE_DIR} ${CMAKE_SOURCE_DIR}/dep/recastnavigation/Detour/Include ${CMAKE_SOURCE_DIR}/src/collision ${CMAKE_SOURCE_DIR}/src/collision/Management @@ -43,10 +42,12 @@ target_link_libraries(${PROJECT_NAME} world ) -install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION ${ASCEMU_SCRIPTLIB_PATH} LIBRARY DESTINATION ${ASCEMU_SCRIPTLIB_PATH}) - # generate precompiled header. if (USE_PCH) message(STATUS "Generate PCH for ${PROJECT_NAME}") target_precompile_headers(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/pchExtraScripts.hpp) endif () + +install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION ${ASCEMU_SCRIPTLIB_PATH} LIBRARY DESTINATION ${ASCEMU_SCRIPTLIB_PATH}) + +unset(EXTRASCRIPTS_SRCS) diff --git a/src/scripts/GossipScripts/CMakeLists.txt b/src/scripts/GossipScripts/CMakeLists.txt index 97275ed05..699c60f97 100644 --- a/src/scripts/GossipScripts/CMakeLists.txt +++ b/src/scripts/GossipScripts/CMakeLists.txt @@ -22,7 +22,6 @@ set(GOSSIPSCRIPTS_SRCS include_directories( ${OPENSSL_INCLUDE_DIR} - ${PCRE_INCLUDE_DIR} ${CMAKE_SOURCE_DIR}/dep/recastnavigation/Detour/Include ${CMAKE_SOURCE_DIR}/src/collision ${CMAKE_SOURCE_DIR}/src/collision/Management @@ -42,10 +41,12 @@ target_link_libraries(${PROJECT_NAME} world ) -install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION ${ASCEMU_SCRIPTLIB_PATH} LIBRARY DESTINATION ${ASCEMU_SCRIPTLIB_PATH}) - # generate precompiled header. if (USE_PCH) message(STATUS "Generate PCH for ${PROJECT_NAME}") target_precompile_headers(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/pchGossipScripts.hpp) endif () + +install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION ${ASCEMU_SCRIPTLIB_PATH} LIBRARY DESTINATION ${ASCEMU_SCRIPTLIB_PATH}) + +unset(GOSSIPSCRIPTS_SRCS) diff --git a/src/scripts/InstanceScripts/CMakeLists.txt b/src/scripts/InstanceScripts/CMakeLists.txt index f2f351082..af7f64148 100644 --- a/src/scripts/InstanceScripts/CMakeLists.txt +++ b/src/scripts/InstanceScripts/CMakeLists.txt @@ -40,6 +40,7 @@ file(GLOB SRC_TBC_SCRIPTS_FILES Tbc/*.cpp Tbc/*.h) file(GLOB SRC_TBC_AUCHENAICRYPTS_SCRIPTS_FILES Tbc/Auchindoun/AuchenauCrypts/*.cpp Tbc/Auchindoun/AuchenauCrypts/*.h) file(GLOB SRC_TBC_MANATOMBS_SCRIPTS_FILES Tbc/Auchindoun/ManaTombs/*.cpp Tbc/Auchindoun/ManaTombs/*.h) file(GLOB SRC_TBC_SETHEKKHALLS_SCRIPTS_FILES Tbc/Auchindoun/SethekkHalls/*.cpp Tbc/Auchindoun/SethekkHalls/*.h) +file(GLOB SRC_TBC_SHADOWLABYRINTH_SCRIPTS_FILES Tbc/Auchindoun/ShadowLabyrinth/*.cpp Tbc/Auchindoun/ShadowLabyrinth/*.h) file(GLOB SRC_TBC_BLACKTEMPLE_SCRIPTS_FILES Tbc/BlackTemple/*.cpp Tbc/BlackTemple/*.h) file(GLOB SRC_TBC_COTBOFHYJAL_SCRIPTS_FILES Tbc/CavensOfTime/BattleOfMountHyjal/*.cpp Tbc/CavensOfTime/BattleOfMountHyjal/*.h) file(GLOB SRC_TBC_COTBLACKMORASS_SCRIPTS_FILES Tbc/CavensOfTime/BlackMorass/*.cpp Tbc/CavensOfTime/BlackMorass/*.h) @@ -127,6 +128,8 @@ set(INSTANCESCRIPTS_SRCS ${SRC_CLASSIC_WAILING_SCRIPTS_FILES} ${SRC_CLASSIC_ZUL_FARAK_SCRIPTS_FILES} ${SRC_CLASSIC_ZUL_GURUB_SCRIPTS_FILES} + ${SRC_LOCAL_DIR} + ${SRC_TBC_SCRIPTS_FILES} ${SRC_TBC_AUCHENAICRYPTS_SCRIPTS_FILES} ${SRC_TBC_MANATOMBS_SCRIPTS_FILES} @@ -153,6 +156,7 @@ set(INSTANCESCRIPTS_SRCS ${SRC_TBC_MECHANAR_SCRIPTS_FILES} ${SRC_TBC_THEEYE_SCRIPTS_FILES} ${SRC_TBC_ZULAMAN_SCRIPTS_FILES} + ${SRC_WOTLK_SCRIPTS_FILES} ${SRC_WOTLK_AHNKAHETOLDK_SCRIPTS_FILES} ${SRC_WOTLK_AZJOLNERUB_SCRIPTS_FILES} @@ -178,8 +182,8 @@ set(INSTANCESCRIPTS_SRCS ${SRC_WOTLK_UTGARDEPINACLE_SCRIPTS_FILES} ${SRC_WOTLK_VAULTOFARCHAVON_SCRIPTS_FILES} ${SRC_WOTLK_VIOLETHOLD_SCRIPTS_FILES} + ${SRC_CATA_SCRIPTS_FILES} - ${SRC_LOCAL_DIR} ) include_directories( @@ -286,10 +290,12 @@ target_link_libraries(${PROJECT_NAME} world ) -install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION ${ASCEMU_SCRIPTLIB_PATH} LIBRARY DESTINATION ${ASCEMU_SCRIPTLIB_PATH}) - # generate precompiled header. if (USE_PCH) message(STATUS "Generate PCH for ${PROJECT_NAME}") target_precompile_headers(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/pchInstanceScripts.hpp) endif () + +install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION ${ASCEMU_SCRIPTLIB_PATH} LIBRARY DESTINATION ${ASCEMU_SCRIPTLIB_PATH}) + +unset(INSTANCESCRIPTS_SRCS) diff --git a/src/scripts/LuaEngine/CMakeLists.txt b/src/scripts/LuaEngine/CMakeLists.txt index cf9d43e54..636eef53e 100644 --- a/src/scripts/LuaEngine/CMakeLists.txt +++ b/src/scripts/LuaEngine/CMakeLists.txt @@ -47,10 +47,12 @@ target_link_libraries(${PROJECT_NAME} lualib ) -install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION ${ASCEMU_SCRIPTLIB_PATH} LIBRARY DESTINATION ${ASCEMU_SCRIPTLIB_PATH}) - # generate precompiled header. if (USE_PCH) message(STATUS "Generate PCH for ${PROJECT_NAME}") target_precompile_headers(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/pchLuaEngine.hpp) endif () + +install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION ${ASCEMU_SCRIPTLIB_PATH} LIBRARY DESTINATION ${ASCEMU_SCRIPTLIB_PATH}) + +unset(LUAENGINE_SRCS) diff --git a/src/scripts/LuaEngine/LUAEngine.cpp b/src/scripts/LuaEngine/LUAEngine.cpp index d04f7d2b3..c883b2c5f 100644 --- a/src/scripts/LuaEngine/LUAEngine.cpp +++ b/src/scripts/LuaEngine/LUAEngine.cpp @@ -116,8 +116,7 @@ void LuaEngine::LoadScripts() } ////////////////////////////////////////////////////////////////////////////////////////// -// FUNCTION CALL METHODS - +// Function call methods void LuaEngine::BeginCall(uint16_t fReference) { lua_settop(lu, 0); //stack should be empty @@ -157,8 +156,7 @@ void LuaEngine::EndCall(uint8_t res) } ////////////////////////////////////////////////////////////////////////////////////////// -// PUSH METHODS - +// Push methods void LuaEngine::PushUnit(Object* unit, lua_State* L) { Unit* pUnit = nullptr; @@ -250,10 +248,8 @@ void LuaEngine::PushAura(Aura* aura, lua_State* L) else ArcLuna::push(L, aura); } - -/******************************************************************************* -END PUSH METHODS -*******************************************************************************/ +// End push methods +////////////////////////////////////////////////////////////////////////////////////////// void LuaEngine::HyperCallFunction(const char* FuncName, int ref) //hyper as in hypersniper :3 { diff --git a/src/scripts/MiscScripts/CMakeLists.txt b/src/scripts/MiscScripts/CMakeLists.txt index ff4e78679..1b016d5e2 100644 --- a/src/scripts/MiscScripts/CMakeLists.txt +++ b/src/scripts/MiscScripts/CMakeLists.txt @@ -41,10 +41,12 @@ target_link_libraries(${PROJECT_NAME} world ) -install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION ${ASCEMU_SCRIPTLIB_PATH} LIBRARY DESTINATION ${ASCEMU_SCRIPTLIB_PATH}) - # generate precompiled header. if (USE_PCH) message(STATUS "Generate PCH for ${PROJECT_NAME}") target_precompile_headers(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/pchMiscScripts.hpp) endif () + +install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION ${ASCEMU_SCRIPTLIB_PATH} LIBRARY DESTINATION ${ASCEMU_SCRIPTLIB_PATH}) + +unset(MISCSCRIPTS_SRCS) diff --git a/src/scripts/QuestScripts/CMakeLists.txt b/src/scripts/QuestScripts/CMakeLists.txt index 1c13dfe10..034051d4c 100644 --- a/src/scripts/QuestScripts/CMakeLists.txt +++ b/src/scripts/QuestScripts/CMakeLists.txt @@ -42,10 +42,12 @@ target_link_libraries(${PROJECT_NAME} world ) -install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION ${ASCEMU_SCRIPTLIB_PATH} LIBRARY DESTINATION ${ASCEMU_SCRIPTLIB_PATH}) - # generate precompiled header. if (USE_PCH) message(STATUS "Generate PCH for ${PROJECT_NAME}") target_precompile_headers(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/pchQuestScripts.hpp) endif () + +install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION ${ASCEMU_SCRIPTLIB_PATH} LIBRARY DESTINATION ${ASCEMU_SCRIPTLIB_PATH}) + +unset(QUESTSCRIPTS_SRCS) diff --git a/src/scripts/SpellHandlers/CMakeLists.txt b/src/scripts/SpellHandlers/CMakeLists.txt index 465d58eb3..d7b99730d 100644 --- a/src/scripts/SpellHandlers/CMakeLists.txt +++ b/src/scripts/SpellHandlers/CMakeLists.txt @@ -24,7 +24,6 @@ set(headers include_directories( ${OPENSSL_INCLUDE_DIR} - ${PCRE_INCLUDE_DIR} ${CMAKE_SOURCE_DIR}/dep/recastnavigation/Detour/Include ${CMAKE_SOURCE_DIR}/src/collision ${CMAKE_SOURCE_DIR}/src/collision/Management @@ -47,13 +46,13 @@ target_link_libraries(${PROJECT_NAME} world ) -install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION ${ASCEMU_SCRIPTLIB_PATH} LIBRARY DESTINATION ${ASCEMU_SCRIPTLIB_PATH} ) - # generate precompiled header. if (USE_PCH) message(STATUS "Generate PCH for ${PROJECT_NAME}") target_precompile_headers(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/pchSpellHandlers.hpp) endif () +install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION ${ASCEMU_SCRIPTLIB_PATH} LIBRARY DESTINATION ${ASCEMU_SCRIPTLIB_PATH} ) + unset(sources) unset(headers) diff --git a/src/scripts/SpellHandlers/LegacyFiles/CMakeLists.txt b/src/scripts/SpellHandlers/LegacyFiles/CMakeLists.txt index 95925fa08..77affcd3c 100644 --- a/src/scripts/SpellHandlers/LegacyFiles/CMakeLists.txt +++ b/src/scripts/SpellHandlers/LegacyFiles/CMakeLists.txt @@ -20,4 +20,5 @@ set(SRC_SPELL_SCRIPTS_LEGACY_FILES ) source_group(LegacyFiles FILES ${SRC_SPELL_SCRIPTS_LEGACY_FILES}) + unset(PATH_PREFIX) diff --git a/src/scripts/SpellHandlers/Scripts/CMakeLists.txt b/src/scripts/SpellHandlers/Scripts/CMakeLists.txt index 858ce4d2f..4d50d65b1 100644 --- a/src/scripts/SpellHandlers/Scripts/CMakeLists.txt +++ b/src/scripts/SpellHandlers/Scripts/CMakeLists.txt @@ -21,4 +21,5 @@ set(SRC_SPELL_SCRIPTS_FILES ) source_group(Scripts FILES ${SRC_SPELL_SCRIPTS_FILES}) + unset(PATH_PREFIX) diff --git a/src/shared/CMakeLists.txt b/src/shared/CMakeLists.txt index eaee86106..6afe225ac 100644 --- a/src/shared/CMakeLists.txt +++ b/src/shared/CMakeLists.txt @@ -17,7 +17,6 @@ file(GLOB SRC_UTILITIES_FILES Utilities/*.cpp Utilities/*.h Utilities/*.hpp) file(GLOB SRC_LOCAL_DIR *.cpp *.h *.hpp) set(SHARED_SRCS - ${SHARED_SRCS} ${SRC_CONFIG_FILES} ${SRC_CRYPTOGRAPHY_FILES} ${SRC_DATABASE_FILES} @@ -55,7 +54,6 @@ add_library(${PROJECT_NAME} STATIC ${SHARED_SRCS}) target_link_libraries(${PROJECT_NAME} PUBLIC ${ZLIB_LIBRARIES} - ${CMAKE_THREAD_LIBS_INIT} ${MYSQL_LIBRARY} ${OPENSSL_LIBRARIES} ${EXTRA_LIBS} @@ -75,3 +73,5 @@ if (USE_PCH) message(STATUS "Generate PCH for ${PROJECT_NAME}") target_precompile_headers(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/pchShared.hpp) endif () + +unset(SHARED_SRCS) diff --git a/src/tools/ToolsCataMop/map_extractor/CMakeLists.txt b/src/tools/ToolsCataMop/map_extractor/CMakeLists.txt index d1ff40e5c..4c23968ba 100644 --- a/src/tools/ToolsCataMop/map_extractor/CMakeLists.txt +++ b/src/tools/ToolsCataMop/map_extractor/CMakeLists.txt @@ -28,3 +28,5 @@ target_link_libraries(${PROJECT_NAME} ) install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION ${ASCEMU_TOOLS_PATH}) + +unset(MAPS_EXTRACTOR_SRCS) diff --git a/src/tools/ToolsCataMop/mmaps_generator/CMakeLists.txt b/src/tools/ToolsCataMop/mmaps_generator/CMakeLists.txt index 08548c41e..3956d9876 100644 --- a/src/tools/ToolsCataMop/mmaps_generator/CMakeLists.txt +++ b/src/tools/ToolsCataMop/mmaps_generator/CMakeLists.txt @@ -13,7 +13,6 @@ include_directories( ${CMAKE_SOURCE_DIR}/dep/recastnavigation/Detour/Include ${CMAKE_SOURCE_DIR}/dep/recastnavigation/Recast/Include ${CMAKE_SOURCE_DIR}/dep/g3dlite/include - ${PCRE_INCLUDE_DIR} ${CMAKE_SOURCE_DIR}/src/shared ${CMAKE_SOURCE_DIR}/src/collision ${CMAKE_SOURCE_DIR}/src/collision/Management @@ -33,7 +32,8 @@ target_link_libraries(${PROJECT_NAME} collision Detour Recast - ${PCRE_LIBRARIES} ) install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION ${ASCEMU_TOOLS_PATH}) + +unset(MMAPS_EXTRACTOR_SRCS) diff --git a/src/tools/ToolsCataMop/vmap_tools/vmap4_assembler/CMakeLists.txt b/src/tools/ToolsCataMop/vmap_tools/vmap4_assembler/CMakeLists.txt index 9f723bd48..e707723f5 100644 --- a/src/tools/ToolsCataMop/vmap_tools/vmap4_assembler/CMakeLists.txt +++ b/src/tools/ToolsCataMop/vmap_tools/vmap4_assembler/CMakeLists.txt @@ -30,3 +30,5 @@ target_link_libraries(${PROJECT_NAME} ) install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION ${ASCEMU_TOOLS_PATH}) + +unset(VMAPS_EXTRACTOR_SRCS) diff --git a/src/tools/ToolsCataMop/vmap_tools/vmap4_extractor/CMakeLists.txt b/src/tools/ToolsCataMop/vmap_tools/vmap4_extractor/CMakeLists.txt index c447d69d4..4724311cb 100644 --- a/src/tools/ToolsCataMop/vmap_tools/vmap4_extractor/CMakeLists.txt +++ b/src/tools/ToolsCataMop/vmap_tools/vmap4_extractor/CMakeLists.txt @@ -32,3 +32,5 @@ target_link_libraries(${PROJECT_NAME} ) install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION ${ASCEMU_TOOLS_PATH}) + +unset(VMAPS_EXTRACTOR_SRCS) diff --git a/src/tools/map_extractor/CMakeLists.txt b/src/tools/map_extractor/CMakeLists.txt index ce953ae00..57c944471 100644 --- a/src/tools/map_extractor/CMakeLists.txt +++ b/src/tools/map_extractor/CMakeLists.txt @@ -28,3 +28,5 @@ target_link_libraries(${PROJECT_NAME} ) install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION ${ASCEMU_TOOLS_PATH}) + +unset(MAPS_EXTRACTOR_SRCS) diff --git a/src/tools/mmaps_generator/CMakeLists.txt b/src/tools/mmaps_generator/CMakeLists.txt index 08548c41e..3956d9876 100644 --- a/src/tools/mmaps_generator/CMakeLists.txt +++ b/src/tools/mmaps_generator/CMakeLists.txt @@ -13,7 +13,6 @@ include_directories( ${CMAKE_SOURCE_DIR}/dep/recastnavigation/Detour/Include ${CMAKE_SOURCE_DIR}/dep/recastnavigation/Recast/Include ${CMAKE_SOURCE_DIR}/dep/g3dlite/include - ${PCRE_INCLUDE_DIR} ${CMAKE_SOURCE_DIR}/src/shared ${CMAKE_SOURCE_DIR}/src/collision ${CMAKE_SOURCE_DIR}/src/collision/Management @@ -33,7 +32,8 @@ target_link_libraries(${PROJECT_NAME} collision Detour Recast - ${PCRE_LIBRARIES} ) install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION ${ASCEMU_TOOLS_PATH}) + +unset(MMAPS_EXTRACTOR_SRCS) diff --git a/src/tools/vmap_tools/vmap4_assembler/CMakeLists.txt b/src/tools/vmap_tools/vmap4_assembler/CMakeLists.txt index 9f723bd48..e707723f5 100644 --- a/src/tools/vmap_tools/vmap4_assembler/CMakeLists.txt +++ b/src/tools/vmap_tools/vmap4_assembler/CMakeLists.txt @@ -30,3 +30,5 @@ target_link_libraries(${PROJECT_NAME} ) install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION ${ASCEMU_TOOLS_PATH}) + +unset(VMAPS_EXTRACTOR_SRCS) diff --git a/src/tools/vmap_tools/vmap4_extractor/CMakeLists.txt b/src/tools/vmap_tools/vmap4_extractor/CMakeLists.txt index 0df8d484b..cd2d2161e 100644 --- a/src/tools/vmap_tools/vmap4_extractor/CMakeLists.txt +++ b/src/tools/vmap_tools/vmap4_extractor/CMakeLists.txt @@ -35,3 +35,5 @@ target_link_libraries(${PROJECT_NAME} ) install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION ${ASCEMU_TOOLS_PATH}) + +unset(VMAPS_EXTRACTOR_SRCS) diff --git a/src/world/CMakeLists.txt b/src/world/CMakeLists.txt index ec4d50cc6..ca22df659 100644 --- a/src/world/CMakeLists.txt +++ b/src/world/CMakeLists.txt @@ -6,9 +6,6 @@ project(world CXX) file(GLOB SRC_CHAT_FILES Chat/*.cpp Chat/*.h Chat/*.hpp) file(GLOB SRC_COMMAND_FILES Chat/Commands/*.cpp Chat/Commands/*.h Chat/Commands/*.hpp) file(GLOB SRC_DATA_FILES Data/*.cpp Data/*.h Data/*.hpp) - -include(Game${ASCEMU_VERSION}/Storage/CMakeLists.txt) # SCH: coming soon - file(GLOB SRC_MACROS_FILES Macros/*.cpp Macros/*.h Macros/*.hpp) file(GLOB SRC_MANAGEMENT_FILES Management/*.cpp Management/*.h Management/*.hpp) file(GLOB SRC_MANAGEMENT_BATTLEGROUND_FILES Management/Battleground/*.cpp Management/Battleground/*.h Management/Battleground/*.hpp) @@ -43,39 +40,32 @@ file(GLOB SRC_SPELL_CUSTOM_FILES Spell/Customization/*.cpp Spell/Customization/* file(GLOB SRC_SPELL_DEFINITIONS_FILES Spell/Definitions/*.cpp Spell/Definitions/*.h Spell/Definitions/*.hpp) file(GLOB SRC_STORAGE_FILES Storage/*.cpp Storage/*.h Storage/*.hpp) file(GLOB SRC_STORAGE_DBC_FILES Storage/DBC/*.cpp Storage/DBC/*.h Storage/DBC/*.hpp) +file(GLOB SRC_LOCAL_DIR *.cpp *.h *.hpp) -if ("${ASCEMU_VERSION}" STREQUAL "Mop" OR "${ASCEMU_VERSION}" STREQUAL "Cata") +# version-specific includes. +if ("${ASCEMU_VERSION}" STREQUAL "Classic") + file(GLOB SRC_GAMECLASSIC_STORAGE_FILES GameClassic/Storage/*.cpp GameClassic/Storage/*.h GameClassic/Storage/*.hpp) +elseif ("${ASCEMU_VERSION}" STREQUAL "TBC") + file(GLOB SRC_GAMEBC_STORAGE_FILES GameTBC/Storage/*.cpp GameTBC/Storage/*.h GameTBC/Storage/*.hpp) +elseif ("${ASCEMU_VERSION}" STREQUAL "WotLK") + file(GLOB SRC_GAMELK_STORAGE_FILES GameWotLK/Storage/*.cpp GameWotLK/Storage/*.h GameWotLK/Storage/*.hpp) +elseif ("${ASCEMU_VERSION}" STREQUAL "Cata") + file(GLOB SRC_GAMECATA_STORAGE_FILES GameCata/Storage/*.cpp GameCata/Storage/*.h GameCata/Storage/*.hpp) + file(GLOB SRC_STORAGE_DB2_FILES Storage/DB2/*.cpp Storage/DB2/*.h Storage/DB2/*.hpp) +elseif ("${ASCEMU_VERSION}" STREQUAL "Mop") + file(GLOB SRC_GAMEMOP_STORAGE_FILES GameMop/Storage/*.cpp GameMop/Storage/*.h GameMop/Storage/*.hpp) file(GLOB SRC_STORAGE_DB2_FILES Storage/DB2/*.cpp Storage/DB2/*.h Storage/DB2/*.hpp) endif () if (WIN32) - set(SRC_WORLD_PROJECT ${SRC_WORLD_PROJECT} ${CMAKE_CURRENT_SOURCE_DIR}/resources.rc) + set(APP_ICON_RESOURCE_WINDOWS "${CMAKE_CURRENT_SOURCE_DIR}/resources.rc") endif () set(WORLD_SRCS - ${WORLD_SRCS} - ${SRC_GAMECLASSIC_FILES} - ${SRC_GAMECLASSIC_STORAGE_FILES} - - ${SRC_GAMEBC_FILES} - ${SRC_GAMEBC_STORAGE_FILES} - - ${SRC_GAMELK_FILES} - ${SRC_GAMELK_STORAGE_FILES} - - ${SRC_GAMECATA_FILES} - ${SRC_GAMECATA_MANAGEMENT_FILES} - ${SRC_GAMECATA_STORAGE_FILES} - - ${SRC_GAMEMOP_FILES} - ${SRC_GAMEMOP_MANAGEMENT_FILES} - ${SRC_GAMEMOP_STORAGE_FILES} - - ${SRC_MACROS_FILES} ${SRC_CHAT_FILES} ${SRC_COMMAND_FILES} ${SRC_DATA_FILES} - + ${SRC_MACROS_FILES} ${SRC_MANAGEMENT_FILES} ${SRC_MANAGEMENT_BATTLEGROUND_FILES} ${SRC_MANAGEMENT_GOSSIP_FILES} @@ -89,39 +79,61 @@ set(WORLD_SRCS ${SRC_MAP_MANAGEMENT_FILES} ${SRC_MAP_MAPS_FILES} ${SRC_MOVEMENT_FILES} - ${SRC_MOVEMENT_SPLINE_FILES} ${SRC_MOVEMENT_MOVEMENTGENERATOR_FILES} + ${SRC_MOVEMENT_SPLINE_FILES} ${SRC_OBJECTS_FILES} + ${SRC_UNITS_FILES} + ${SRC_UNITS_CREATURES_FILES} + ${SRC_UNITS_SUMMONS_FILES} + ${SRC_UNITS_PLAYERS_FILES} + ${SRC_SERVER_FILES} + ${SRC_SERVER_CONSOLE_FILES} + ${SRC_LOGON_COMMUNICATION_CLIENT_FILES} ${SRC_PACKET_FILES} ${SRC_PACKET_HANDLER_FILES} ${SRC_PACKET_MOVEMENT_FILES} - ${SRC_SERVER_FILES} - ${SRC_SERVER_CONSOLE_FILES} ${SRC_SERVER_SCRIPT_FILES} ${SRC_SERVER_WARDEN_FILES} - ${SRC_LOGON_COMMUNICATION_CLIENT_FILES} ${SRC_SPELL_FILES} ${SRC_SPELL_CUSTOM_FILES} ${SRC_SPELL_DEFINITIONS_FILES} ${SRC_STORAGE_FILES} ${SRC_STORAGE_DBC_FILES} - ${SRC_UNITS_FILES} - ${SRC_UNITS_CREATURES_FILES} - ${SRC_UNITS_PLAYERS_FILES} - ${SRC_UNITS_SUMMONS_FILES} - ${SRC_WORLD_PROJECT} + ${SRC_LOCAL_DIR} ) -if ("${ASCEMU_VERSION}" STREQUAL "Mop" OR "${ASCEMU_VERSION}" STREQUAL "Cata") - set(WORLD_SRCS - ${WORLD_SRCS} - ${SRC_STORAGE_DB2_FILES} +# version-specific includes. +if ("${ASCEMU_VERSION}" STREQUAL "Classic") +set(WORLD_SRCS + ${WORLD_SRCS} + ${SRC_GAMECLASSIC_STORAGE_FILES} +) +elseif ("${ASCEMU_VERSION}" STREQUAL "TBC") +set(WORLD_SRCS + ${WORLD_SRCS} + ${SRC_GAMEBC_STORAGE_FILES} +) +elseif ("${ASCEMU_VERSION}" STREQUAL "WotLK") +set(WORLD_SRCS + ${WORLD_SRCS} + ${SRC_GAMELK_STORAGE_FILES} +) +elseif ("${ASCEMU_VERSION}" STREQUAL "Cata") +set(WORLD_SRCS + ${WORLD_SRCS} + ${SRC_GAMECATA_STORAGE_FILES} + ${SRC_STORAGE_DB2_FILES} +) +elseif ("${ASCEMU_VERSION}" STREQUAL "Mop") +set(WORLD_SRCS + ${WORLD_SRCS} + ${SRC_GAMEMOP_STORAGE_FILES} + ${SRC_STORAGE_DB2_FILES} ) endif () include_directories( ${OPENSSL_INCLUDE_DIR} - ${PCRE_INCLUDE_DIR} ${CMAKE_SOURCE_DIR}/dep/recastnavigation/Detour/Include ${CMAKE_SOURCE_DIR}/dep/recastnavigation/Recast/Include ${CMAKE_SOURCE_DIR}/src/collision @@ -137,8 +149,6 @@ include_directories( ) # source group. -source_group(world FILES ${SRC_WORLD_PROJECT}) - source_group(Chat FILES ${SRC_CHAT_FILES}) source_group(Chat\\Commands FILES ${SRC_COMMAND_FILES}) source_group(Data FILES ${SRC_DATA_FILES}) @@ -176,9 +186,23 @@ source_group(Spell\\Customization FILES ${SRC_SPELL_CUSTOM_FILES}) source_group(Spell\\Definitions FILES ${SRC_SPELL_DEFINITIONS_FILES}) source_group(Storage FILES ${SRC_STORAGE_FILES}) source_group(Storage\\DBC FILES ${SRC_STORAGE_DBC_FILES}) -source_group(Storage\\DB2 FILES ${SRC_STORAGE_DB2_FILES}) -add_executable(${PROJECT_NAME} ${WORLD_SRCS}) +# version-specific includes. +if ("${ASCEMU_VERSION}" STREQUAL "Classic") +source_group(GameClassic\\Storage FILES ${SRC_GAMECLASSIC_STORAGE_FILES}) +elseif ("${ASCEMU_VERSION}" STREQUAL "TBC") +source_group(GameTBC\\Storage FILES ${SRC_GAMEBC_STORAGE_FILES}) +elseif ("${ASCEMU_VERSION}" STREQUAL "WotLK") +source_group(GameWotLK\\Storage FILES ${SRC_GAMELK_STORAGE_FILES}) +elseif ("${ASCEMU_VERSION}" STREQUAL "Cata") +source_group(GameCata\\Storage FILES ${SRC_GAMECATA_STORAGE_FILES}) +source_group(Storage\\DB2 FILES ${SRC_STORAGE_DB2_FILES}) +elseif ("${ASCEMU_VERSION}" STREQUAL "Mop") +source_group(GameMop\\Storage FILES ${SRC_GAMEMOP_STORAGE_FILES}) +source_group(Storage\\DB2 FILES ${SRC_STORAGE_DB2_FILES}) +endif () + +add_executable(${PROJECT_NAME} ${WORLD_SRCS} ${APP_ICON_RESOURCE_WINDOWS}) if (WIN32 AND NOT USE_PCH) set_target_properties(${PROJECT_NAME} PROPERTIES LINK_FLAGS "/INCREMENTAL:NO") @@ -205,13 +229,14 @@ target_link_libraries(${PROJECT_NAME} g3dlite Detour Recast - ${PCRE_LIBRARIES} ) -install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION .) - # generate precompiled header. if (USE_PCH) message(STATUS "Generate PCH for ${PROJECT_NAME}") target_precompile_headers(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/pchWorld.hpp) endif () + +install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION .) + +unset(WORLD_SRCS) diff --git a/src/world/GameCata/Storage/CMakeLists.txt b/src/world/GameCata/Storage/CMakeLists.txt deleted file mode 100644 index 9494896d7..000000000 --- a/src/world/GameCata/Storage/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -# Copyright (c) 2014-2023 AscEmu Team - -set(PATH_PREFIX GameCata/Storage) - -set(SRC_GAMECATA_STORAGE_FILES - ${PATH_PREFIX}/DBCStores.cpp - ${PATH_PREFIX}/DBCStores.h - ${PATH_PREFIX}/DBCStructures.cpp - ${PATH_PREFIX}/DBCStructures.h -) - -source_group(GameCata\\Storage FILES ${SRC_GAMECATA_STORAGE_FILES}) -unset(PATH_PREFIX) diff --git a/src/world/GameClassic/Storage/CMakeLists.txt b/src/world/GameClassic/Storage/CMakeLists.txt deleted file mode 100644 index 3ba4853f4..000000000 --- a/src/world/GameClassic/Storage/CMakeLists.txt +++ /dev/null @@ -1,12 +0,0 @@ -# Copyright (c) 2014-2023 AscEmu Team - -set(PATH_PREFIX GameClassic/Storage) - -set(SRC_GAMECLASSIC_STORAGE_FILES - ${PATH_PREFIX}/DBCStores.cpp - ${PATH_PREFIX}/DBCStores.h - ${PATH_PREFIX}/DBCStructures.h -) - -source_group(GameClassic\\Storage FILES ${SRC_GAMECLASSIC_STORAGE_FILES}) -unset(PATH_PREFIX) diff --git a/src/world/GameMop/Storage/CMakeLists.txt b/src/world/GameMop/Storage/CMakeLists.txt deleted file mode 100644 index 74564427e..000000000 --- a/src/world/GameMop/Storage/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -# Copyright (c) 2014-2023 AscEmu Team - -set(PATH_PREFIX GameMop/Storage) - -set(SRC_GAMEMOP_STORAGE_FILES - ${PATH_PREFIX}/DBCStores.cpp - ${PATH_PREFIX}/DBCStores.h - ${PATH_PREFIX}/DBCStructures.cpp - ${PATH_PREFIX}/DBCStructures.h -) - -source_group(GameMop\\Storage FILES ${SRC_GAMEMOP_STORAGE_FILES}) -unset(PATH_PREFIX) diff --git a/src/world/GameTBC/Storage/CMakeLists.txt b/src/world/GameTBC/Storage/CMakeLists.txt deleted file mode 100644 index 1b9247b77..000000000 --- a/src/world/GameTBC/Storage/CMakeLists.txt +++ /dev/null @@ -1,12 +0,0 @@ -# Copyright (c) 2014-2023 AscEmu Team - -set(PATH_PREFIX GameTBC/Storage) - -set(SRC_GAMEBC_STORAGE_FILES - ${PATH_PREFIX}/DBCStores.cpp - ${PATH_PREFIX}/DBCStores.h - ${PATH_PREFIX}/DBCStructures.h -) - -source_group(GameTBC\\Storage FILES ${SRC_GAMEBC_STORAGE_FILES}) -unset(PATH_PREFIX) diff --git a/src/world/GameWotLK/Storage/CMakeLists.txt b/src/world/GameWotLK/Storage/CMakeLists.txt deleted file mode 100644 index 864b2d251..000000000 --- a/src/world/GameWotLK/Storage/CMakeLists.txt +++ /dev/null @@ -1,12 +0,0 @@ -# Copyright (c) 2014-2023 AscEmu Team - -set(PATH_PREFIX GameWotLK/Storage) - -set(SRC_GAMELK_STORAGE_FILES - ${PATH_PREFIX}/DBCStores.cpp - ${PATH_PREFIX}/DBCStores.h - ${PATH_PREFIX}/DBCStructures.h -) - -source_group(GameWotLK\\Storage FILES ${SRC_GAMELK_STORAGE_FILES}) -unset(PATH_PREFIX) diff --git a/src/world/Server/Packets/Handlers/CalendarHandler.cpp b/src/world/Server/Packets/Handlers/CalendarHandler.cpp index 7ba6e59d8..8a4882ba7 100644 --- a/src/world/Server/Packets/Handlers/CalendarHandler.cpp +++ b/src/world/Server/Packets/Handlers/CalendarHandler.cpp @@ -149,9 +149,7 @@ void WorldSession::sendCalendarRaidLockoutUpdated(InstanceSaved const* save) if (!save) return; - WoWGuid guid = _player->getGuid(); - sLogger.debugFlag(AscEmu::Logging::LF_OPCODE, "SMSG_CALENDAR_RAID_LOCKOUT_UPDATED [%s] Map: %u, Difficulty %u", - guid, save->getMapId(), save->getDifficulty()); + sLogger.debugFlag(AscEmu::Logging::LF_OPCODE, "SMSG_CALENDAR_RAID_LOCKOUT_UPDATED [%u] Map: %u, Difficulty %u", _player->getGuid(), save->getMapId(), save->getDifficulty()); const auto now = Util::getTimeNow(); time_t currTime = now; diff --git a/src/world/Storage/DBC/CMakeLists.txt b/src/world/Storage/DBC/CMakeLists.txt deleted file mode 100644 index 1cbe94ed2..000000000 --- a/src/world/Storage/DBC/CMakeLists.txt +++ /dev/null @@ -1,19 +0,0 @@ -# Copyright (c) 2014-2023 AscEmu Team - -set(PATH_PREFIX Storage/DBC) - -set(SRC_STORAGE_DBC_FILES - ${PATH_PREFIX}/DBCGlobals.hpp - ${PATH_PREFIX}/DBCLoader.cpp - ${PATH_PREFIX}/DBCLoader.hpp - ${PATH_PREFIX}/DBCRecord.cpp - ${PATH_PREFIX}/DBCRecord.hpp - ${PATH_PREFIX}/DBCSQL.cpp - ${PATH_PREFIX}/DBCSQL.hpp - ${PATH_PREFIX}/DBCStorage.hpp - ${PATH_PREFIX}/DBCStores.h - ${PATH_PREFIX}/DBCStructures.hpp -) - -source_group(Storage\\DBC FILES ${SRC_STORAGE_DBC_FILES}) -unset(PATH_PREFIX) diff --git a/src/world/WorldConf.h.in b/src/world/WorldConf.h.in index db7913d50..8c1302d1a 100644 --- a/src/world/WorldConf.h.in +++ b/src/world/WorldConf.h.in @@ -10,9 +10,6 @@ This file is released under the MIT license. See README-MIT for more information #define CONFDIR "@ASCEMU_CONFIGSFILE_PATH@" #define PREFIX "@ASCEMU_SCRIPTLIB_PATH@" -/*! \brief USE_PCH_INCLUDES is commented/uncommented by cmake option USE_PCH. */ -@ASCEMU_COMMENT_PCH@#define USE_PCH_INCLUDES - #if VERSION_STRING == Classic #define AE_CLASSIC #define VERSION 1, 12, 1