diff options
| -rw-r--r-- | CMakeLists.txt | 10 | ||||
| -rw-r--r-- | src/bindings/interface/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/bindings/scripts/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/trinitycore/trinitycore.conf.dist | 5 |
4 files changed, 16 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 8b64bc192ac..35e518476d9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -122,7 +122,9 @@ if(ACE_FOUND) message(STATUS "Found ACE library: ${ACE_LIBRARY}") message(STATUS "Include dir is: ${ACE_INCLUDE_DIR}") else(ACE_FOUND) -message(SEND_ERROR "** ACE library not found! Trinity Core will not build!") +message(SEND_ERROR "** ACE library not found! Trinity Core cannot be compiled!") +message(SEND_ERROR "** Please build ACE from http://www.cs.wustl.edu/~schmidt/ACE.html") +message(SEND_ERROR "** your distro may provide a binary for ACE e.g. for ubuntu try apt-get install libace-dev") return() #SET(BUILD_ACE 1) #SET(ACE_INCLUDE_DIR "${CMAKE_SOURCE_DIR}/dep/ACE_wrappers ${CMAKE_BINARY_DIR}/dep/ACE_wrappers") @@ -154,6 +156,12 @@ ${CMAKE_CURRENT_SOURCE_DIR}/.. ${ACE_INCLUDE_DIR} ) +if(PREFIX) +message("* Running ldconfig") +file(WRITE /etc/ld.so.conf.d/trinitycore.conf "${CMAKE_INSTALL_PREFIX}/lib") +execute_process(COMMAND ldconfig) +endif(PREFIX) + add_subdirectory(dep) add_subdirectory(doc) add_subdirectory(src) diff --git a/src/bindings/interface/CMakeLists.txt b/src/bindings/interface/CMakeLists.txt index 4a8f0872422..4cffc6446fd 100644 --- a/src/bindings/interface/CMakeLists.txt +++ b/src/bindings/interface/CMakeLists.txt @@ -11,7 +11,7 @@ SET(trinityinterface_LIB_SRCS Scripts/sc_defines.h ) -add_library(trinityinterface STATIC ${trinityinterface_LIB_SRCS}) +add_library(trinityinterface SHARED ${trinityinterface_LIB_SRCS}) target_link_libraries(trinityinterface) diff --git a/src/bindings/scripts/CMakeLists.txt b/src/bindings/scripts/CMakeLists.txt index 636530b9527..0ee315816e1 100644 --- a/src/bindings/scripts/CMakeLists.txt +++ b/src/bindings/scripts/CMakeLists.txt @@ -380,7 +380,7 @@ SET(trinityscript_LIB_SRCS system.cpp ) -add_library(trinityscript STATIC ${trinityscript_LIB_SRCS}) +add_library(trinityscript SHARED ${trinityscript_LIB_SRCS}) target_link_libraries(trinityscript) diff --git a/src/trinitycore/trinitycore.conf.dist b/src/trinitycore/trinitycore.conf.dist index af81a84038f..27253cc875b 100644 --- a/src/trinitycore/trinitycore.conf.dist +++ b/src/trinitycore/trinitycore.conf.dist @@ -653,6 +653,11 @@ Server.LoginInfo = 0 # Default: 0 (Not allowed) # 1 (Allowed) # +# AllowTwoSide.Trade +# Allow or not trading with other team in party. +# Default: 0 (Not allowed) +# 1 (Allowed) +# # TalentsInspecting # Allow other players see character talents in inspect dialog (Characters in Gamemaster mode can # inspect talents always) |