diff --git a/src/modules/SD2/docs/SQL_guide.md b/doc/SD2_SQL_guide.md similarity index 100% rename from src/modules/SD2/docs/SQL_guide.md rename to doc/SD2_SQL_guide.md diff --git a/src/modules/SD2/docs/Script_Layout.md b/doc/SD2_Script_Layout.md similarity index 100% rename from src/modules/SD2/docs/Script_Layout.md rename to doc/SD2_Script_Layout.md diff --git a/src/modules/SD2/docs/Text-tables.md b/doc/SD2_Text-tables.md similarity index 100% rename from src/modules/SD2/docs/Text-tables.md rename to doc/SD2_Text-tables.md diff --git a/src/game/WorldHandlers/ScriptMgr.cpp b/src/game/WorldHandlers/ScriptMgr.cpp index 1b7e93eb..bd8200ea 100644 --- a/src/game/WorldHandlers/ScriptMgr.cpp +++ b/src/game/WorldHandlers/ScriptMgr.cpp @@ -43,7 +43,7 @@ #include "LuaEngine.h" #endif /* ENABLE_ELUNA */ #ifdef ENABLE_SD2 -#include "ScriptDevMgr.h" +#include "system/ScriptDevMgr.h" #endif #include /* std::strcmp */ diff --git a/src/modules/SD2/CMakeLists.txt b/src/modules/SD2/CMakeLists.txt index 4707c1e7..b39a24a5 100644 --- a/src/modules/SD2/CMakeLists.txt +++ b/src/modules/SD2/CMakeLists.txt @@ -22,240 +22,230 @@ include(MacroMangosSourceGroup) -set(mangosscript_PCH_H "${CMAKE_CURRENT_SOURCE_DIR}/precompiled.h") +#Add PCH Files +set(mangosscript_PCH "${CMAKE_CURRENT_SOURCE_DIR}/precompiled.h") if(PCH) - set(mangosscript_PCH_CPP "${CMAKE_CURRENT_SOURCE_DIR}/precompiled.cpp") + LIST(APPEND mangosscript_PCH "${CMAKE_CURRENT_SOURCE_DIR}/precompiled.cpp") endif() include_directories( - "${CMAKE_CURRENT_SOURCE_DIR}" - "${CMAKE_CURRENT_SOURCE_DIR}/base" - "${CMAKE_CURRENT_SOURCE_DIR}/include" - "${CMAKE_SOURCE_DIR}/src/shared" - "${CMAKE_SOURCE_DIR}/src/framework" - "${CMAKE_SOURCE_DIR}/src/game/Server" - "${CMAKE_SOURCE_DIR}/src/game/BattleGround" - "${CMAKE_SOURCE_DIR}/src/game/WorldHandlers" - "${CMAKE_SOURCE_DIR}/src/game/Object" - "${CMAKE_SOURCE_DIR}/src/game/References" - "${CMAKE_SOURCE_DIR}/src/game/MotionGenerators" - "${CMAKE_SOURCE_DIR}/src/game/vmap" - "${CMAKE_SOURCE_DIR}/dep/include" - "${CMAKE_SOURCE_DIR}/src/shared" - "${CMAKE_SOURCE_DIR}/src/shared/Utilities" - "${CMAKE_SOURCE_DIR}/src/shared/Log" - "${CMAKE_SOURCE_DIR}/src/shared/DataStores" - "${CMAKE_SOURCE_DIR}/src/shared/Common" - "${CMAKE_BINARY_DIR}" - "${CMAKE_BINARY_DIR}/src/shared" - "${ACE_INCLUDE_DIR}" - "${MYSQL_INCLUDE_DIR}" + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/base + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${CMAKE_SOURCE_DIR}/src/shared + ${CMAKE_SOURCE_DIR}/src/framework + ${CMAKE_SOURCE_DIR}/src/game/Server + ${CMAKE_SOURCE_DIR}/src/game/BattleGround + ${CMAKE_SOURCE_DIR}/src/game/WorldHandlers + ${CMAKE_SOURCE_DIR}/src/game/Object + ${CMAKE_SOURCE_DIR}/src/game/References + ${CMAKE_SOURCE_DIR}/src/game/MotionGenerators + ${CMAKE_SOURCE_DIR}/src/game/vmap + ${CMAKE_SOURCE_DIR}/dep/include + ${CMAKE_SOURCE_DIR}/src/shared + ${CMAKE_SOURCE_DIR}/src/shared/Utilities + ${CMAKE_SOURCE_DIR}/src/shared/Log + ${CMAKE_SOURCE_DIR}/src/shared/DataStores + ${CMAKE_SOURCE_DIR}/src/shared/Common + ${CMAKE_BINARY_DIR} + ${CMAKE_BINARY_DIR}/src/shared + ${ACE_INCLUDE_DIR} + ${MYSQL_INCLUDE_DIR} ) -#----------------------------------------------------------------------------- -# Define the scriptdev2 library -set(sources - sd2_revision_nr.h - sd2_revision_sql.h - ScriptDevMgr.cpp - ScriptDevMgr.h - - ${mangosscript_PCH_H} - ${mangosscript_PCH_CPP} -) - -set(mangosscript_LIB_SRCS ${sources}) +# Define the SD2 library +set(mangosscript_LIB_SRCS ${mangosscript_PCH}) #Include Files file(GLOB sources_include include/*.cpp include/*.h) - LIST(APPEND mangosscript_LIB_SRCS ${sources_include}) - source_group("Include Files" FILES ${sources_include}) + LIST(APPEND mangosscript_LIB_SRCS ${sources_include}) + source_group("Include Files" FILES ${sources_include}) #System Files file(GLOB sources_system system/*.cpp system/*.h) - LIST(APPEND mangosscript_LIB_SRCS ${sources_system}) - source_group("System Files" FILES ${sources_system}) + LIST(APPEND mangosscript_LIB_SRCS ${sources_system}) + source_group("System Files" FILES ${sources_system}) #Base Files file(GLOB sources_base base/*.cpp base/*.h) - LIST(APPEND mangosscript_LIB_SRCS ${sources_base}) - source_group("Base Files" FILES ${sources_base}) + LIST(APPEND mangosscript_LIB_SRCS ${sources_base}) + source_group("Base Files" FILES ${sources_base}) #Battleground Scripts file(GLOB sources_battlegrounds scripts/battlegrounds/*.cpp scripts/battlegrounds/*.h) - LIST(APPEND mangosscript_LIB_SRCS ${sources_battlegrounds}) - source_group("Battleground Scripts" FILES ${sources_battlegrounds}) + LIST(APPEND mangosscript_LIB_SRCS ${sources_battlegrounds}) + source_group("Battleground Scripts" FILES ${sources_battlegrounds}) #World Scripts file(GLOB sources_world scripts/world/*.cpp scripts/world/*.h) - LIST(APPEND mangosscript_LIB_SRCS ${sources_world}) - source_group("World Scripts" FILES ${sources_world}) + LIST(APPEND mangosscript_LIB_SRCS ${sources_world}) + source_group("World Scripts" FILES ${sources_world}) #Eastern Kingdom Scripts file(GLOB sources_eastern_kingdoms scripts/eastern_kingdoms/*.cpp scripts/eastern_kingdoms/*.h) - LIST(APPEND mangosscript_LIB_SRCS ${sources_eastern_kingdoms}) - source_group("Eastern Kingdoms Scripts" FILES ${sources_eastern_kingdoms}) + LIST(APPEND mangosscript_LIB_SRCS ${sources_eastern_kingdoms}) + source_group("Eastern Kingdoms Scripts" FILES ${sources_eastern_kingdoms}) #Kalimdor Scripts file(GLOB sources_kalimdor scripts/kalimdor/*.cpp scripts/kalimdor/*.h) - LIST(APPEND mangosscript_LIB_SRCS ${sources_kalimdor}) - source_group("Kalimdor Scripts" FILES ${sources_kalimdor}) + LIST(APPEND mangosscript_LIB_SRCS ${sources_kalimdor}) + source_group("Kalimdor Scripts" FILES ${sources_kalimdor}) #Instance: Blackrock Depths Scripts file(GLOB sources_instance_ek_brd scripts/eastern_kingdoms/blackrock_mountain/blackrock_depths/*.cpp scripts/eastern_kingdoms/blackrock_mountain/blackrock_depths/*.h) - LIST(APPEND mangosscript_LIB_SRCS ${sources_instance_ek_brd}) - source_group("Eastern Kingdoms Scripts\\Instances\\Blackrock Depths" FILES ${sources_instance_ek_brd}) + LIST(APPEND mangosscript_LIB_SRCS ${sources_instance_ek_brd}) + source_group("Eastern Kingdoms Scripts\\Instances\\Blackrock Depths" FILES ${sources_instance_ek_brd}) #Instance: Blackrock Spire Scripts file(GLOB sources_instance_ek_brs scripts/eastern_kingdoms/blackrock_mountain/blackrock_spire/*.cpp scripts/eastern_kingdoms/blackrock_mountain/blackrock_spire/*.h) - LIST(APPEND mangosscript_LIB_SRCS ${sources_instance_ek_brs}) - source_group("Eastern Kingdoms Scripts\\Instances\\Blackrock Spire" FILES ${sources_instance_ek_brs}) + LIST(APPEND mangosscript_LIB_SRCS ${sources_instance_ek_brs}) + source_group("Eastern Kingdoms Scripts\\Instances\\Blackrock Spire" FILES ${sources_instance_ek_brs}) #Instance: Deadmines Scripts file(GLOB sources_instance_ek_tdm scripts/eastern_kingdoms/deadmines/*.cpp scripts/eastern_kingdoms/deadmines/*.h) - LIST(APPEND mangosscript_LIB_SRCS ${sources_instance_ek_tdm}) - source_group("Eastern Kingdoms Scripts\\Instances\\Deadmines" FILES ${sources_instance_ek_tdm}) + LIST(APPEND mangosscript_LIB_SRCS ${sources_instance_ek_tdm}) + source_group("Eastern Kingdoms Scripts\\Instances\\Deadmines" FILES ${sources_instance_ek_tdm}) #Instance: Gnomeregan Scripts file(GLOB sources_instance_ek_gno scripts/eastern_kingdoms/gnomeregan/*.cpp scripts/eastern_kingdoms/gnomeregan/*.h) - LIST(APPEND mangosscript_LIB_SRCS ${sources_instance_ek_gno}) - source_group("Eastern Kingdoms Scripts\\Instances\\Gnomeregan" FILES ${sources_instance_ek_gno}) + LIST(APPEND mangosscript_LIB_SRCS ${sources_instance_ek_gno}) + source_group("Eastern Kingdoms Scripts\\Instances\\Gnomeregan" FILES ${sources_instance_ek_gno}) #Instance: Scarlet Monastery Scripts file(GLOB sources_instance_ek_sm scripts/eastern_kingdoms/scarlet_monastery/*.cpp scripts/eastern_kingdoms/scarlet_monastery/*.h) - LIST(APPEND mangosscript_LIB_SRCS ${sources_instance_ek_sm}) - source_group("Eastern Kingdoms Scripts\\Instances\\Scarlet Monastery" FILES ${sources_instance_ek_sm}) + LIST(APPEND mangosscript_LIB_SRCS ${sources_instance_ek_sm}) + source_group("Eastern Kingdoms Scripts\\Instances\\Scarlet Monastery" FILES ${sources_instance_ek_sm}) #Instance: Scholomance Scripts file(GLOB sources_instance_ek_scholo scripts/eastern_kingdoms/scholomance/*.cpp scripts/eastern_kingdoms/scholomance/*.h) - LIST(APPEND mangosscript_LIB_SRCS ${sources_instance_ek_scholo}) - source_group("Eastern Kingdoms Scripts\\Instances\\Scholomance" FILES ${sources_instance_ek_scholo}) + LIST(APPEND mangosscript_LIB_SRCS ${sources_instance_ek_scholo}) + source_group("Eastern Kingdoms Scripts\\Instances\\Scholomance" FILES ${sources_instance_ek_scholo}) #Instance: Uldaman Scripts file(GLOB sources_instance_ek_uld scripts/eastern_kingdoms/uldaman/*.cpp scripts/eastern_kingdoms/uldaman/*.h) - LIST(APPEND mangosscript_LIB_SRCS ${sources_instance_ek_uld}) - source_group("Eastern Kingdoms Scripts\\Instances\\Uldaman" FILES ${sources_instance_ek_uld}) + LIST(APPEND mangosscript_LIB_SRCS ${sources_instance_ek_uld}) + source_group("Eastern Kingdoms Scripts\\Instances\\Uldaman" FILES ${sources_instance_ek_uld}) #Instance: Shadowfang Keep Scripts file(GLOB sources_instance_ek_sfk scripts/eastern_kingdoms/shadowfang_keep/*.cpp scripts/eastern_kingdoms/shadowfang_keep/*.h) - LIST(APPEND mangosscript_LIB_SRCS ${sources_instance_ek_sfk}) - source_group("Eastern Kingdoms Scripts\\Instances\\Shadowfang Keep" FILES ${sources_instance_ek_sfk}) + LIST(APPEND mangosscript_LIB_SRCS ${sources_instance_ek_sfk}) + source_group("Eastern Kingdoms Scripts\\Instances\\Shadowfang Keep" FILES ${sources_instance_ek_sfk}) #Instance: Sunken Temple Scripts file(GLOB sources_instance_ek_st scripts/eastern_kingdoms/sunken_temple/*.cpp scripts/eastern_kingdoms/sunken_temple/*.h) - LIST(APPEND mangosscript_LIB_SRCS ${sources_instance_ek_st}) - source_group("Eastern Kingdoms Scripts\\Instances\\Sunken Temple" FILES ${sources_instance_ek_st}) + LIST(APPEND mangosscript_LIB_SRCS ${sources_instance_ek_st}) + source_group("Eastern Kingdoms Scripts\\Instances\\Sunken Temple" FILES ${sources_instance_ek_st}) #Instance: Stratholme Scripts file(GLOB sources_instance_ek_files scripts/eastern_kingdoms/stratholme/*.cpp scripts/eastern_kingdoms/stratholme/*.h) - LIST(APPEND mangosscript_LIB_SRCS ${sources_instance_ek_files}) - source_group("Eastern Kingdoms Scripts\\Instances\\Stratholme" FILES ${sources_instance_ek_files}) + LIST(APPEND mangosscript_LIB_SRCS ${sources_instance_ek_files}) + source_group("Eastern Kingdoms Scripts\\Instances\\Stratholme" FILES ${sources_instance_ek_files}) #Raid: Molten Core Scripts file(GLOB sources_raid_ek_mc scripts/eastern_kingdoms/blackrock_mountain/molten_core/*.cpp scripts/eastern_kingdoms/blackrock_mountain/molten_core/*.h) - LIST(APPEND mangosscript_LIB_SRCS ${sources_raid_ek_mc}) - source_group("Eastern Kingdoms Scripts\\Raids\\Molten Core" FILES ${sources_raid_ek_mc}) + LIST(APPEND mangosscript_LIB_SRCS ${sources_raid_ek_mc}) + source_group("Eastern Kingdoms Scripts\\Raids\\Molten Core" FILES ${sources_raid_ek_mc}) #Raid: Blackwing Lair Scripts file(GLOB sources_raid_ek_bwl scripts/eastern_kingdoms/blackrock_mountain/blackwing_lair/*.cpp scripts/eastern_kingdoms/blackrock_mountain/blackwing_lair/*.h) - LIST(APPEND mangosscript_LIB_SRCS ${sources_raid_ek_bwl}) - source_group("Eastern Kingdoms Scripts\\Raids\\Blackwing Lair" FILES ${sources_raid_ek_bwl}) + LIST(APPEND mangosscript_LIB_SRCS ${sources_raid_ek_bwl}) + source_group("Eastern Kingdoms Scripts\\Raids\\Blackwing Lair" FILES ${sources_raid_ek_bwl}) #Raid: Naxxramas Scripts file(GLOB sources_raid_ek_naxx scripts/eastern_kingdoms/naxxramas/*.cpp scripts/eastern_kingdoms/naxxramas/*.h) - LIST(APPEND mangosscript_LIB_SRCS ${sources_raid_ek_naxx}) - source_group("Eastern Kingdoms Scripts\\Raids\\Naxxramas" FILES ${sources_raid_ek_naxx}) + LIST(APPEND mangosscript_LIB_SRCS ${sources_raid_ek_naxx}) + source_group("Eastern Kingdoms Scripts\\Raids\\Naxxramas" FILES ${sources_raid_ek_naxx}) #Raid: Zul Gurub Scripts file(GLOB sources_raid_ek_zg scripts/eastern_kingdoms/zulgurub/*.cpp scripts/eastern_kingdoms/zulgurub/*.h) - LIST(APPEND mangosscript_LIB_SRCS ${sources_raid_ek_zg}) - source_group("Eastern Kingdoms Scripts\\Raids\\Zul Gurub" FILES ${sources_raid_ek_zg}) + LIST(APPEND mangosscript_LIB_SRCS ${sources_raid_ek_zg}) + source_group("Eastern Kingdoms Scripts\\Raids\\Zul Gurub" FILES ${sources_raid_ek_zg}) #Instance: Blackfathom Deeps Scripts file(GLOB sources_instance_k_bdf scripts/kalimdor/blackfathom_deeps/*.cpp scripts/kalimdor/blackfathom_deeps/*.h) - LIST(APPEND mangosscript_LIB_SRCS ${sources_instance_k_bdf}) - source_group("Kalimdor Scripts\\Instances\\Blackfathom Deeps" FILES ${sources_instance_k_bdf}) + LIST(APPEND mangosscript_LIB_SRCS ${sources_instance_k_bdf}) + source_group("Kalimdor Scripts\\Instances\\Blackfathom Deeps" FILES ${sources_instance_k_bdf}) #Instance: Dire Maul Scripts file(GLOB sources_instance_k_dm scripts/kalimdor/dire_maul/*.cpp scripts/kalimdor/dire_maul/*.h) - LIST(APPEND mangosscript_LIB_SRCS ${sources_instance_k_dm}) - source_group("Kalimdor Scripts\\Instances\\Dire Maul" FILES ${sources_instance_k_dm}) + LIST(APPEND mangosscript_LIB_SRCS ${sources_instance_k_dm}) + source_group("Kalimdor Scripts\\Instances\\Dire Maul" FILES ${sources_instance_k_dm}) #Instance: Maraudon Scripts file(GLOB sources_instance_k_mara scripts/kalimdor/maraudon/*.cpp scripts/kalimdor/maraudon/*.h) - LIST(APPEND mangosscript_LIB_SRCS ${sources_instance_k_mara}) - source_group("Kalimdor Scripts\\Instances\\Maraudon Scripts" FILES ${sources_instance_k_mara}) + LIST(APPEND mangosscript_LIB_SRCS ${sources_instance_k_mara}) + source_group("Kalimdor Scripts\\Instances\\Maraudon Scripts" FILES ${sources_instance_k_mara}) #Instance: Razorfen Downs Scripts file(GLOB sources_instance_k_rfd scripts/kalimdor/razorfen_downs/*.cpp scripts/kalimdor/razorfen_downs/*.h) - LIST(APPEND mangosscript_LIB_SRCS ${sources_instance_k_rfd}) - source_group("Kalimdor Scripts\\Instances\\Razorfen Downs" FILES ${sources_instance_k_rfd}) + LIST(APPEND mangosscript_LIB_SRCS ${sources_instance_k_rfd}) + source_group("Kalimdor Scripts\\Instances\\Razorfen Downs" FILES ${sources_instance_k_rfd}) #Instance: Razorfen Kraul Scripts file(GLOB sources_instance_k_rfk scripts/kalimdor/razorfen_kraul/*.cpp scripts/kalimdor/razorfen_kraul/*.h) - LIST(APPEND mangosscript_LIB_SRCS ${sources_instance_k_rfk}) - source_group("Kalimdor Scripts\\Instances\\Razorfen Kraul" FILES ${sources_instance_k_rfk}) + LIST(APPEND mangosscript_LIB_SRCS ${sources_instance_k_rfk}) + source_group("Kalimdor Scripts\\Instances\\Razorfen Kraul" FILES ${sources_instance_k_rfk}) #Instance: Wailing Caverns Scripts file(GLOB sources_instance_k_wc scripts/kalimdor/wailing_caverns/*.cpp scripts/kalimdor/wailing_caverns/*.h) - LIST(APPEND mangosscript_LIB_SRCS ${sources_instance_k_wc}) - source_group("Kalimdor Scripts\\Instances\\Wailing Caverns" FILES ${sources_instance_k_wc}) + LIST(APPEND mangosscript_LIB_SRCS ${sources_instance_k_wc}) + source_group("Kalimdor Scripts\\Instances\\Wailing Caverns" FILES ${sources_instance_k_wc}) #Instance: Zul Farrak Scripts file(GLOB sources_instance_k_zf scripts/kalimdor/zulfarrak/*.cpp scripts/kalimdor/zulfarrak/*.h) - LIST(APPEND mangosscript_LIB_SRCS ${sources_instance_k_zf}) - source_group("Kalimdor Scripts\\Instances\\Zul Farrak" FILES ${sources_instance_k_zf}) + LIST(APPEND mangosscript_LIB_SRCS ${sources_instance_k_zf}) + source_group("Kalimdor Scripts\\Instances\\Zul Farrak" FILES ${sources_instance_k_zf}) #Raid: Onyxias Lair Scripts file(GLOB sources_raid_k_ony scripts/kalimdor/onyxias_lair/*.cpp scripts/kalimdor/onyxias_lair/*.h) - LIST(APPEND mangosscript_LIB_SRCS ${sources_raid_k_ony}) - source_group("Kalimdor Scripts\\Raids\\Onyxias Lair" FILES ${sources_raid_k_ony}) + LIST(APPEND mangosscript_LIB_SRCS ${sources_raid_k_ony}) + source_group("Kalimdor Scripts\\Raids\\Onyxias Lair" FILES ${sources_raid_k_ony}) #Raid: Ruins of AQ Scripts file(GLOB sources_raid_k_raq scripts/kalimdor/ruins_of_ahnqiraj/*.cpp scripts/kalimdor/ruins_of_ahnqiraj/*.h) - LIST(APPEND mangosscript_LIB_SRCS ${sources_raid_k_raq}) - source_group("Kalimdor Scripts\\Raids\\Ruins of AQ" FILES ${sources_raid_k_raq}) + LIST(APPEND mangosscript_LIB_SRCS ${sources_raid_k_raq}) + source_group("Kalimdor Scripts\\Raids\\Ruins of AQ" FILES ${sources_raid_k_raq}) #Raid: Temple of AQ Scripts file(GLOB sources_raid_k_taq scripts/kalimdor/temple_of_ahnqiraj/*.cpp scripts/kalimdor/temple_of_ahnqiraj/*.h) - LIST(APPEND mangosscript_LIB_SRCS ${sources_raid_k_taq}) - source_group("Kalimdor Scripts\\Raids\\Temple of AQ" FILES ${sources_raid_k_taq}) + LIST(APPEND mangosscript_LIB_SRCS ${sources_raid_k_taq}) + source_group("Kalimdor Scripts\\Raids\\Temple of AQ" FILES ${sources_raid_k_taq}) add_library(mangosscript STATIC - ${mangosscript_LIB_SRCS} + ${mangosscript_LIB_SRCS} ) - -# Generate precompiled header + +# Generate PCH if(PCH) - ADD_CXX_PCH(mangosscript ${mangosscript_PCH_H} ${mangosscript_PCH_CPP}) + ADD_CXX_PCH(mangosscript ${mangosscript_PCH}) endif() if(NOT ACE_USE_EXTERNAL) - add_dependencies(mangosscript ace) + add_dependencies(mangosscript ace) endif() if(UNIX) - set(mangosscript_LINK_FLAGS "-pthread") - if(APPLE) - set(mangosscript_LINK_FLAGS "-framework Carbon ${mangosscript_LINK_FLAGS}") - # Needed for the linking because of the missing symbols - set(mangosscript_LINK_FLAGS "-Wl,-undefined -Wl,dynamic_lookup ${mangosscript_LINK_FLAGS}") - endif() + set(mangosscript_LINK_FLAGS "-pthread") + if(APPLE) + set(mangosscript_LINK_FLAGS "-framework Carbon ${mangosscript_LINK_FLAGS}") + # Needed for the linking because of the missing symbols + set(mangosscript_LINK_FLAGS "-Wl,-undefined -Wl,dynamic_lookup ${mangosscript_LINK_FLAGS}") + endif() - if(APPLE) - set(mangosscript_PROPERTIES INSTALL_NAME_DIR "${LIBS_DIR}") - else() - set(mangosscript_PROPERTIES INSTALL_RPATH ${LIBS_DIR}) - endif() + if(APPLE) + set(mangosscript_PROPERTIES INSTALL_NAME_DIR ${LIBS_DIR}) + else() + set(mangosscript_PROPERTIES INSTALL_RPATH ${LIBS_DIR}) + endif() - # Run out of build tree - set(mangosscript_PROPERTIES - ${mangosscript_PROPERTIES} - BUILD_WITH_INSTALL_RPATH OFF - ) + # Run out of build tree + set(mangosscript_PROPERTIES + ${mangosscript_PROPERTIES} + BUILD_WITH_INSTALL_RPATH OFF + ) - set_target_properties(mangosscript PROPERTIES - LINK_FLAGS ${mangosscript_LINK_FLAGS} - ${mangosscript_PROPERTIES} - ) + set_target_properties(mangosscript PROPERTIES + LINK_FLAGS ${mangosscript_LINK_FLAGS} + ${mangosscript_PROPERTIES} + ) endif() diff --git a/src/modules/SD2/config-sd2.h b/src/modules/SD2/config-sd2.h deleted file mode 100644 index 0627e103..00000000 --- a/src/modules/SD2/config-sd2.h +++ /dev/null @@ -1,38 +0,0 @@ -/** - * ScriptDev2 is an extension for mangos providing enhanced features for - * area triggers, creatures, game objects, instances, items, and spells beyond - * the default database scripting in mangos. - * - * Copyright (C) 2006-2013 ScriptDev2 - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * World of Warcraft, and all World of Warcraft or Warcraft art, images, - * and lore are copyrighted by Blizzard Entertainment, Inc. - */ - -#ifndef SC_CONFIG_H -#define SC_CONFIG_H - -#include "Platform/CompilerDefs.h" -//#include "revision.h" -#include "sd2_revision_nr.h" -#include "SystemConfig.h" - -#ifndef SCRIPTDEV2_VERSION - #define SCRIPTDEV2_VERSION "Revision [" SD2_REVISION_NR "] (" REVISION_ID ") " REVISION_DATE " " REVISION_TIME -#endif - -#endif diff --git a/src/modules/SD2/docs/LICENSE.txt b/src/modules/SD2/docs/LICENSE.txt deleted file mode 100644 index 69cd8a1d..00000000 --- a/src/modules/SD2/docs/LICENSE.txt +++ /dev/null @@ -1,280 +0,0 @@ - GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 - - Copyright (C) 1989, 1991 Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -License is intended to guarantee your freedom to share and change free -software--to make sure the software is free for all its users. This -General Public License applies to most of the Free Software -Foundation's software and to any other program whose authors commit to -using it. (Some other Free Software Foundation software is covered by -the GNU Lesser General Public License instead.) You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -this service if you wish), that you receive source code or can get it -if you want it, that you can change the software or use pieces of it -in new free programs; and that you know you can do these things. - - To protect your rights, we need to make restrictions that forbid -anyone to deny you these rights or to ask you to surrender the rights. -These restrictions translate to certain responsibilities for you if you -distribute copies of the software, or if you modify it. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must give the recipients all the rights that -you have. You must make sure that they, too, receive or can get the -source code. And you must show them these terms so they know their -rights. - - We protect your rights with two steps: (1) copyright the software, and -(2) offer you this license which gives you legal permission to copy, -distribute and/or modify the software. - - Also, for each author's protection and ours, we want to make certain -that everyone understands that there is no warranty for this free -software. If the software is modified by someone else and passed on, we -want its recipients to know that what they have is not the original, so -that any problems introduced by others will not reflect on the original -authors' reputations. - - Finally, any free program is threatened constantly by software -patents. We wish to avoid the danger that redistributors of a free -program will individually obtain patent licenses, in effect making the -program proprietary. To prevent this, we have made it clear that any -patent must be licensed for everyone's free use or not licensed at all. - - The precise terms and conditions for copying, distribution and -modification follow. - - GNU GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License applies to any program or other work which contains -a notice placed by the copyright holder saying it may be distributed -under the terms of this General Public License. The "Program", below, -refers to any such program or work, and a "work based on the Program" -means either the Program or any derivative work under copyright law: -that is to say, a work containing the Program or a portion of it, -either verbatim or with modifications and/or translated into another -language. (Hereinafter, translation is included without limitation in -the term "modification".) Each licensee is addressed as "you". - -Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running the Program is not restricted, and the output from the Program -is covered only if its contents constitute a work based on the -Program (independent of having been made by running the Program). -Whether that is true depends on what the Program does. - - 1. You may copy and distribute verbatim copies of the Program's -source code as you receive it, in any medium, provided that you -conspicuously and appropriately publish on each copy an appropriate -copyright notice and disclaimer of warranty; keep intact all the -notices that refer to this License and to the absence of any warranty; -and give any other recipients of the Program a copy of this License -along with the Program. - -You may charge a fee for the physical act of transferring a copy, and -you may at your option offer warranty protection in exchange for a fee. - - 2. You may modify your copy or copies of the Program or any portion -of it, thus forming a work based on the Program, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) You must cause the modified files to carry prominent notices - stating that you changed the files and the date of any change. - - b) You must cause any work that you distribute or publish, that in - whole or in part contains or is derived from the Program or any - part thereof, to be licensed as a whole at no charge to all third - parties under the terms of this License. - - c) If the modified program normally reads commands interactively - when run, you must cause it, when started running for such - interactive use in the most ordinary way, to print or display an - announcement including an appropriate copyright notice and a - notice that there is no warranty (or else, saying that you provide - a warranty) and that users may redistribute the program under - these conditions, and telling the user how to view a copy of this - License. (Exception: if the Program itself is interactive but - does not normally print such an announcement, your work based on - the Program is not required to print an announcement.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Program, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Program, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Program. - -In addition, mere aggregation of another work not based on the Program -with the Program (or with a work based on the Program) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may copy and distribute the Program (or a work based on it, -under Section 2) in object code or executable form under the terms of -Sections 1 and 2 above provided that you also do one of the following: - - a) Accompany it with the complete corresponding machine-readable - source code, which must be distributed under the terms of Sections - 1 and 2 above on a medium customarily used for software interchange; or, - - b) Accompany it with a written offer, valid for at least three - years, to give any third party, for a charge no more than your - cost of physically performing source distribution, a complete - machine-readable copy of the corresponding source code, to be - distributed under the terms of Sections 1 and 2 above on a medium - customarily used for software interchange; or, - - c) Accompany it with the information you received as to the offer - to distribute corresponding source code. (This alternative is - allowed only for noncommercial distribution and only if you - received the program in object code or executable form with such - an offer, in accord with Subsection b above.) - -The source code for a work means the preferred form of the work for -making modifications to it. For an executable work, complete source -code means all the source code for all modules it contains, plus any -associated interface definition files, plus the scripts used to -control compilation and installation of the executable. However, as a -special exception, the source code distributed need not include -anything that is normally distributed (in either source or binary -form) with the major components (compiler, kernel, and so on) of the -operating system on which the executable runs, unless that component -itself accompanies the executable. - -If distribution of executable or object code is made by offering -access to copy from a designated place, then offering equivalent -access to copy the source code from the same place counts as -distribution of the source code, even though third parties are not -compelled to copy the source along with the object code. - - 4. You may not copy, modify, sublicense, or distribute the Program -except as expressly provided under this License. Any attempt -otherwise to copy, modify, sublicense or distribute the Program is -void, and will automatically terminate your rights under this License. -However, parties who have received copies, or rights, from you under -this License will not have their licenses terminated so long as such -parties remain in full compliance. - - 5. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Program or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Program (or any work based on the -Program), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Program or works based on it. - - 6. Each time you redistribute the Program (or any work based on the -Program), the recipient automatically receives a license from the -original licensor to copy, distribute or modify the Program subject to -these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties to -this License. - - 7. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Program at all. For example, if a patent -license would not permit royalty-free redistribution of the Program by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Program. - -If any portion of this section is held invalid or unenforceable under -any particular circumstance, the balance of the section is intended to -apply and the section as a whole is intended to apply in other -circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system, which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 8. If the distribution and/or use of the Program is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Program under this License -may add an explicit geographical distribution limitation excluding -those countries, so that distribution is permitted only in or among -countries not thus excluded. In such case, this License incorporates -the limitation as if written in the body of this License. - - 9. The Free Software Foundation may publish revised and/or new versions -of the General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - -Each version is given a distinguishing version number. If the Program -specifies a version number of this License which applies to it and "any -later version", you have the option of following the terms and conditions -either of that version or of any later version published by the Free -Software Foundation. If the Program does not specify a version number of -this License, you may choose any version ever published by the Free Software -Foundation. - - 10. If you wish to incorporate parts of the Program into other free -programs whose distribution conditions are different, write to the author -to ask for permission. For software which is copyrighted by the Free -Software Foundation, write to the Free Software Foundation; we sometimes -make exceptions for this. Our decision will be guided by the two goals -of preserving the free status of all derivatives of our free software and -of promoting the sharing and reuse of software generally. - - NO WARRANTY - - 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY -FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN -OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES -PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED -OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS -TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE -PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, -REPAIR OR CORRECTION. - - 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR -REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, -INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING -OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED -TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY -YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER -PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE -POSSIBILITY OF SUCH DAMAGES. - - END OF TERMS AND CONDITIONS \ No newline at end of file diff --git a/src/modules/SD2/docs/License.md b/src/modules/SD2/docs/License.md deleted file mode 100644 index ddf4fcd9..00000000 --- a/src/modules/SD2/docs/License.md +++ /dev/null @@ -1,344 +0,0 @@ -GNU GENERAL PUBLIC LICENSE -========================== - -Version 2, June 1991 - -Copyright (c) 1989, 1981 [Free Software Foundation, Inc.][1] - -Everyone is permitted to copy and distribute verbatim copies of this license -document, but changing it is not allowed. - -## Preamble - -The licenses for most software are designed to take away your freedom to share -and change it. By contrast, the GNU General Public License is intended to -guarantee your freedom to share and change free software -- to make sure the -software is free for all its users. This General Public License applies to most -of the Free Software Foundation's software and to any other program whose -authors commit to using it [^1]. You can apply it to your programs, too. - -When we speak of free software, we are referring to freedom, not price. Our -General Public Licenses are designed to make sure that you have the freedom to -distribute copies of free software (and charge for this service if you wish), -that you receive source code or can get it if you want it, that you can change -the software or use pieces of it in new free programs; and that you know you -can do these things. - -To protect your rights, we need to make restrictions that forbid anyone to deny -you these rights or to ask you to surrender the rights. These restrictions -translate to certain responsibilities for you if you distribute copies of the -software, or if you modify it. - -For example, if you distribute copies of such a program, whether gratis or for -a fee, you must give the recipients all the rights that you have. You must make -sure that they, too, receive or can get the source code. And you must show them -these terms so they know their rights. - -We protect your rights with two steps: (1) copyright the software, and (2) offer -you this license which gives you legal permission to copy, distribute and/or -modify the software. - -Also, for each author's protection and ours, we want to make certain that -everyone understands that there is no warranty for this free software. If the -software is modified by someone else and passed on, we want its recipients to -know that what they have is not the original, so that any problems introduced -by others will not reflect on the original authors' reputations. - -Finally, any free program is threatened constantly by software patents. We wish -to avoid the danger that redistributors of a free program will individually -obtain patent licenses, in effect making the program proprietary. To prevent -this, we have made it clear that any patent must be licensed for everyone's -free use or not licensed at all. - -The precise terms and conditions for copying, distribution and modification -follow. - -## TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - -### 0. - -This License applies to any program or other work which contains a notice -placed by the copyright holder saying it may be distributed under the terms of -this General Public License. The "Program", below, refers to any such program -or work, and a "work based on the Program" means either the Program or any -derivative work under copyright law: that is to say, a work containing the -Program or a portion of it, either verbatim or with modifications and/or -translated into another language. (Hereinafter, translation is included -without limitation in the term "modification".) Each licensee is addressed -as "you". - -Activities other than copying, distribution and modification are not covered by -this License; they are outside its scope. The act of running the Program is not -restricted, and the output from the Program is covered only if its contents -constitute a work based on the Program (independent of having been made by -running the Program). Whether that is true depends on what the Program does. - -### 1. - -You may copy and distribute verbatim copies of the Program's source code as you -receive it, in any medium, provided that you conspicuously and appropriately -publish on each copy an appropriate copyright notice and disclaimer of warranty; -keep intact all the notices that refer to this License and to the absence of -any warranty; and give any other recipients of the Program a copy of this -License along with the Program. - -You may charge a fee for the physical act of transferring a copy, and you may -at your option offer warranty protection in exchange for a fee. - -### 2. - -You may modify your copy or copies of the Program or any portion of it, thus -forming a work based on the Program, and copy and distribute such modifications -or work under the terms of Section 1 above, provided that you also meet all of -these conditions: - -* **a)** You must cause the modified files to carry prominent notices stating - that you changed the files and the date of any change. -* **b)** You must cause any work that you distribute or publish, that in whole - or in part contains or is derived from the Program or any part thereof, to be - licensed as a whole at no charge to all third parties under the terms of this - License. -* **c)** If the modified program normally reads commands interactively when run, - you must cause it, when started running for such interactive use in the most - ordinary way, to print or display an announcement including an appropriate - copyright notice and a notice that there is no warranty (or else, saying that - you provide a warranty) and that users may redistribute the program under - these conditions, and telling the user how to view a copy of this License. - (Exception: if the Program itself is interactive but does not normally print - such an announcement, your work based on the Program is not required to print - an announcement.) - -These requirements apply to the modified work as a whole. If identifiable -sections of that work are not derived from the Program, and can be reasonably -considered independent and separate works in themselves, then this License, -and its terms, do not apply to those sections when you distribute them as -separate works. But when you distribute the same sections as part of a whole -which is a work based on the Program, the distribution of the whole must be on -the terms of this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote it. - -Thus, it is not the intent of this section to claim rights or contest your -rights to work written entirely by you; rather, the intent is to exercise the -right to control the distribution of derivative or collective works based on -the Program. - -In addition, mere aggregation of another work not based on the Program with the -Program (or with a work based on the Program) on a volume of a storage or -distribution medium does not bring the other work under the scope of this -License. - -### 3. - -You may copy and distribute the Program (or a work based on it, under Section 2) -in object code or executable form under the terms of Sections 1 and 2 above -provided that you also do one of the following: - -* **a)** Accompany it with the complete corresponding machine-readable source - code, which must be distributed under the terms of Sections 1 and 2 above on - a medium customarily used for software interchange; or, -* **b)** Accompany it with a written offer, valid for at least three years, to - give any third party, for a charge no more than your cost of physically - performing source distribution, a complete machine-readable copy of the - corresponding source code, to be distributed under the terms of Sections 1 - and 2 above on a medium customarily used for software interchange; or, -* **c)** Accompany it with the information you received as to the offer to - distribute corresponding source code. (This alternative is allowed only for - noncommercial distribution and only if you received the program in object code - or executable form with such an offer, in accord with Subsection b above.) - -The source code for a work means the preferred form of the work for making -modifications to it. For an executable work, complete source code means all -the source code for all modules it contains, plus any associated interface -definition files, plus the scripts used to control compilation and installation -of the executable. However, as a special exception, the source code distributed -need not include anything that is normally distributed (in either source or -binary form) with the major components (compiler, kernel, and so on) of the -operating system on which the executable runs, unless that component itself -accompanies the executable. - -If distribution of executable or object code is made by offering access to copy -from a designated place, then offering equivalent access to copy the source -code from the same place counts as distribution of the source code, even though -third parties are not compelled to copy the source along with the object code. - -### 4. - -You may not copy, modify, sublicense, or distribute the Program except as -expressly provided under this License. Any attempt otherwise to copy, modify, -sublicense or distribute the Program is void, and will automatically terminate -your rights under this License. However, parties who have received copies, or -rights, from you under this License will not have their licenses terminated so -long as such parties remain in full compliance. - -### 5. - -You are not required to accept this License, since you have not signed it. -However, nothing else grants you permission to modify or distribute the Program -or its derivative works. These actions are prohibited by law if you do not -accept this License. Therefore, by modifying or distributing the Program (or any -work based on the Program), you indicate your acceptance of this License to do -so, and all its terms and conditions for copying, distributing or modifying the -Program or works based on it. - -### 6. - -Each time you redistribute the Program (or any work based on the Program), the -recipient automatically receives a license from the original licensor to copy, -distribute or modify the Program subject to these terms and conditions. You may -not impose any further restrictions on the recipients' exercise of the rights -granted herein. You are not responsible for enforcing compliance by third -parties to this License. - -### 7. - -If, as a consequence of a court judgment or allegation of patent infringement -or for any other reason (not limited to patent issues), conditions are imposed -on you (whether by court order, agreement or otherwise) that contradict the -conditions of this License, they do not excuse you from the conditions of this -License. If you cannot distribute so as to satisfy simultaneously your obligations -under this License and any other pertinent obligations, then as a consequence -you may not distribute the Program at all. For example, if a patent license -would not permit royalty-free redistribution of the Program by all those who -receive copies directly or indirectly through you, then the only way you could -satisfy both it and this License would be to refrain entirely from distribution -of the Program. - -If any portion of this section is held invalid or unenforceable under any -particular circumstance, the balance of the section is intended to apply and the -section as a whole is intended to apply in other circumstances. - -It is not the purpose of this section to induce you to infringe any patents or -other property right claims or to contest validity of any such claims; this -section has the sole purpose of protecting the integrity of the free software -distribution system, which is implemented by public license practices. Many -people have made generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that system; it is -up to the author/donor to decide if he or she is willing to distribute software -through any other system and a licensee cannot impose that choice. - -This section is intended to make thoroughly clear what is believed to be a -consequence of the rest of this License. - -### 8. - -If the distribution and/or use of the Program is restricted in certain countries -either by patents or by copyrighted interfaces, the original copyright holder -who places the Program under this License may add an explicit geographical -distribution limitation excluding those countries, so that distribution is -permitted only in or among countries not thus excluded. In such case, this -License incorporates the limitation as if written in the body of this License. - -### 9. - -The Free Software Foundation may publish revised and/or new versions of the -General Public License from time to time. Such new versions will be similar in -spirit to the present version, but may differ in detail to address new problems -or concerns. - -Each version is given a distinguishing version number. If the Program specifies -a version number of this License which applies to it and "any later version", -you have the option of following the terms and conditions either of that version -or of any later version published by the Free Software Foundation. If the Program -does not specify a version number of this License, you may choose any version -ever published by the Free Software Foundation. - -### 10. - -If you wish to incorporate parts of the Program into other free programs whose -distribution conditions are different, write to the author to ask for -permission. For software which is copyrighted by the Free Software Foundation, -write to the Free Software Foundation; we sometimes make exceptions for this. -Our decision will be guided by the two goals of preserving the free status of -all derivatives of our free software and of promoting the sharing and reuse of -software generally. - -## NO WARRANTY - -### 11. - -BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE -PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE -STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE -PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, -INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND -FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND -PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, -YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - -### 12. - -IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY -COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE -PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, -SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY -TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING -RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF -THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER -PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. - -## END OF TERMS AND CONDITIONS - -### How to Apply These Terms to Your New Programs - -If you develop a new program, and you want it to be of the greatest possible -use to the public, the best way to achieve this is to make it free software -which everyone can redistribute and change under these terms. - -To do so, attach the following notices to the program. It is safest to attach -them to the start of each source file to most effectively convey the exclusion -of warranty; and each file should have at least the "copyright" line and a -pointer to where the full notice is found. - - - Copyright (C) - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License along - with this program; if not, write to the Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - -Also add information on how to contact you by electronic and paper mail. - -If the program is interactive, make it output a short notice like this when it -starts in an interactive mode: - - Gnomovision version 69, Copyright (C) year name of author - Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, the commands you use may be -called something other than `show w' and `show c'; they could even be -mouse-clicks or menu items--whatever suits your program. - -You should also get your employer (if you work as a programmer) or your school, -if any, to sign a "copyright disclaimer" for the program, if necessary. Here -is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the program - `Gnomovision' (which makes passes at compilers) written by James Hacker. - - , 1 April 1989 - Ty Coon, President of Vice - -This General Public License does not permit incorporating your program into -proprietary programs. If your program is a subroutine library, you may consider -it more useful to permit linking proprietary applications with the library. If -this is what you want to do, use the GNU Lesser General Public License instead -of this License. - -[^1]: Some other Free Software Foundation software is covered by the GNU Lesser - General Public License instead. - -[1]: http://fsf.org/ "Free Software Foundation, Inc." -[2]: http://www.gnu.org/licenses/ "Licenses - GNU Project" diff --git a/src/modules/SD2/precompiled.h b/src/modules/SD2/precompiled.h index 3013baf7..56b4b91e 100644 --- a/src/modules/SD2/precompiled.h +++ b/src/modules/SD2/precompiled.h @@ -26,7 +26,7 @@ #ifndef SC_PRECOMPILED_H #define SC_PRECOMPILED_H -#include "../ScriptDevMgr.h" +#include "system/ScriptDevMgr.h" #include "Object.h" #include "Unit.h" #include "Creature.h" diff --git a/src/modules/SD2/sd2_revision_nr.h b/src/modules/SD2/sd2_revision_nr.h deleted file mode 100644 index bb736f9c..00000000 --- a/src/modules/SD2/sd2_revision_nr.h +++ /dev/null @@ -1,29 +0,0 @@ -/** - * ScriptDev2 is an extension for mangos providing enhanced features for - * area triggers, creatures, game objects, instances, items, and spells beyond - * the default database scripting in mangos. - * - * Copyright (C) 2006-2013 ScriptDev2 - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * World of Warcraft, and all World of Warcraft or Warcraft art, images, - * and lore are copyrighted by Blizzard Entertainment, Inc. - */ - -#ifndef __SD2_REVISION_NR_H__ -#define __SD2_REVISION_NR_H__ -#define SD2_REVISION_NR "Rel0.19" -#endif // __SD2_REVISION_NR_H__ diff --git a/src/modules/SD2/sd2_revision_sql.h b/src/modules/SD2/sd2_revision_sql.h deleted file mode 100644 index a3aaea16..00000000 --- a/src/modules/SD2/sd2_revision_sql.h +++ /dev/null @@ -1,30 +0,0 @@ -/** - * ScriptDev2 is an extension for mangos providing enhanced features for - * area triggers, creatures, game objects, instances, items, and spells beyond - * the default database scripting in mangos. - * - * Copyright (C) 2006-2013 ScriptDev2 - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * World of Warcraft, and all World of Warcraft or Warcraft art, images, - * and lore are copyrighted by Blizzard Entertainment, Inc. - */ - -#ifndef __SD2_REVISION_SQL_H__ -#define __SD2_REVISION_SQL_H__ -#define REVISION_DB_SCRIPTDEV2 "required__scriptdev2" -#define REVISION_DB_SD2_MANGOS "required__mangos" -#endif // __SD2_REVISION_SQL_H__ diff --git a/src/modules/SD2/ScriptDevMgr.cpp b/src/modules/SD2/system/ScriptDevMgr.cpp similarity index 99% rename from src/modules/SD2/ScriptDevMgr.cpp rename to src/modules/SD2/system/ScriptDevMgr.cpp index df43dba8..dd02538b 100644 --- a/src/modules/SD2/ScriptDevMgr.cpp +++ b/src/modules/SD2/system/ScriptDevMgr.cpp @@ -23,9 +23,8 @@ * and lore are copyrighted by Blizzard Entertainment, Inc. */ -#include "precompiled.h"//..\bindings\scripts\include\precompiled.h" +#include "precompiled.h" #include "Config/Config.h" -#include "config-sd2.h" #include "Database/DatabaseEnv.h" #include "DBCStores.h" #include "ObjectMgr.h" diff --git a/src/modules/SD2/ScriptDevMgr.h b/src/modules/SD2/system/ScriptDevMgr.h similarity index 99% rename from src/modules/SD2/ScriptDevMgr.h rename to src/modules/SD2/system/ScriptDevMgr.h index 5f628ac4..65e262ed 100644 --- a/src/modules/SD2/ScriptDevMgr.h +++ b/src/modules/SD2/system/ScriptDevMgr.h @@ -28,6 +28,7 @@ #include "Common.h" #include "DBCStructure.h" +#include "SystemConfig.h" class Player; class Creature; diff --git a/src/modules/SD2/system/system.cpp b/src/modules/SD2/system/system.cpp index 03bdba8e..35717608 100644 --- a/src/modules/SD2/system/system.cpp +++ b/src/modules/SD2/system/system.cpp @@ -25,7 +25,6 @@ #include "precompiled.h" #include "system.h" -#include "../config-sd2.h" #include "ProgressBar.h" #include "ObjectMgr.h" #include "Database/DatabaseEnv.h" diff --git a/src/shared/CMakeLists.txt b/src/shared/CMakeLists.txt index bacbf21f..5ddf75af 100644 --- a/src/shared/CMakeLists.txt +++ b/src/shared/CMakeLists.txt @@ -53,7 +53,7 @@ source_group("Utilities" FILES ${SRC_GRP_UTIL}) set(LIBRARY_SRCS ${SRC_GRP_AUTH} ${SRC_GRP_COMMON} - ${SRC_GRP_CONFIG} + ${SRC_GRP_CONFIG} ${SRC_GRP_DATABASE} ${SRC_GRP_DATASTORE} ${SRC_GRP_LOCKQ}