server/mangos
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed some annoyances

Browse Source 
- CONF_INSTALL_DIR is no longer hardcoded, except for the case
    when it's explicitely specified via -D in cmake
  - extractor scripts are now copied in tools directory
  - fixed some changes in ACE which made servers crash in FreeBSD
This commit is contained in:
H0zen 2019-06-16 16:44:19 +03:00
parent 03e2f85820
commit ac6d83f9ba
6 changed files with 31 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
CMakeLists.txt
View File

@ -75,9 +75,11 @@ message("")
#==================================================================================# #==================================================================================#
project(MaNGOS VERSION 0.22.0) project(MaNGOS VERSION 0.22.0)
if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
set(CMAKE_INSTALL_PREFIX ${CMAKE_SOURCE_DIR}/install CACHE PATH "Default install directory" FORCE) set(CMAKE_INSTALL_PREFIX ${CMAKE_BINARY_DIR}/install CACHE PATH "Default install directory" FORCE)
endif() endif()
if(DEBUG) if(DEBUG)
set(CMAKE_BUILD_TYPE Debug) set(CMAKE_BUILD_TYPE Debug)
else() else()
@ -85,11 +87,15 @@ else()
endif() endif()
if(UNIX) if(UNIX)
set(BIN_DIR ${CMAKE_INSTALL_PREFIX}/bin) set(BIN_DIR ${CMAKE_INSTALL_PREFIX}/bin)
set(CONF_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/etc) if (NOT CONF_INSTALL_DIR)
set(CONF_INSTALL_DIR ../etc)
endif()
else() else()
set(BIN_DIR ${CMAKE_INSTALL_PREFIX}) set(BIN_DIR ${CMAKE_INSTALL_PREFIX})
set(CONF_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}) if (NOT CONF_INSTALL_DIR)
set(CONF_INSTALL_DIR .)
endif()
endif() endif()
@ -112,4 +118,3 @@ add_subdirectory(dep)
add_subdirectory(src) add_subdirectory(src)
include(${CMAKE_SOURCE_DIR}/cmake/StatusInfo.cmake) include(${CMAKE_SOURCE_DIR}/cmake/StatusInfo.cmake)

1
cmake/FindDL.cmake
View File

@ -22,7 +22,6 @@ find_package_handle_standard_args(DL
FOUND_VAR FOUND_VAR
DL_FOUND DL_FOUND
REQUIRED_VARS REQUIRED_VARS
DL_LIBRARY
DL_INCLUDE_DIR DL_INCLUDE_DIR
) )

2
dep

@ -1 +1 @@
Subproject commit 26edd0e965f55a43ab42e314c28452a087828e2c Subproject commit 8e67306e2ac73634ddf54f59f3c198a217cd1213

2
src/modules/Eluna

@ -1 +1 @@
Subproject commit c027d0bcb5868e87413214e9b68e99b33db41039 Subproject commit ba8891e447a9ee7b0da0088a50943977ebb68aa2

6
src/shared/revision.h
View File

@ -24,7 +24,7 @@
#ifndef MANGOS_H_REVISION #ifndef MANGOS_H_REVISION
#define MANGOS_H_REVISION #define MANGOS_H_REVISION
#define REVISION_NR "2116012" #define REVISION_NR "2116016"
#define REALMD_DB_VERSION_NR 21 #define REALMD_DB_VERSION_NR 21
#define REALMD_DB_STRUCTURE_NR 2 #define REALMD_DB_STRUCTURE_NR 2
@ -38,6 +38,6 @@
#define WORLD_DB_VERSION_NR 21 #define WORLD_DB_VERSION_NR 21
#define WORLD_DB_STRUCTURE_NR 16 #define WORLD_DB_STRUCTURE_NR 16
#define WORLD_DB_CONTENT_NR 012 #define WORLD_DB_CONTENT_NR 016
#define WORLD_DB_UPDATE_DESCRIPTION "quest_8332_text_update" #define WORLD_DB_UPDATE_DESCRIPTION "Fix typo in quest 5064"
#endif // __REVISION_H__ #endif // __REVISION_H__

16
src/tools/CMakeLists.txt
View File

@ -17,4 +17,18 @@
# along with this program; if not, write to the Free Software # along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
add_subdirectory(Extractor_projects) add_subdirectory(Extractor_projects)
#install documentation and generation scripts
install(
FILES
"${CMAKE_CURRENT_SOURCE_DIR}/Extractor_Binaries/ExtractResources.sh"
"${CMAKE_CURRENT_SOURCE_DIR}/Extractor_Binaries/make_vmaps.bat"
"${CMAKE_CURRENT_SOURCE_DIR}/Extractor_Binaries/mmap_excluded.txt"
"${CMAKE_CURRENT_SOURCE_DIR}/Extractor_Binaries/MoveMapGen.sh"
"${CMAKE_CURRENT_SOURCE_DIR}/Extractor_Binaries/offmesh.txt"
"${CMAKE_CURRENT_SOURCE_DIR}/Extractor_Binaries/README.txt"
DESTINATION
"${BIN_DIR}/${TOOLS_DIR}"
)