From db8788ba79916e4d03240484874366b42439c4b6 Mon Sep 17 00:00:00 2001 From: Paradox Date: Sun, 18 Jan 2009 07:44:53 -0500 Subject: [PATCH 1/4] Add description for twosided trading in conf. --HG-- branch : trunk --- src/trinitycore/trinitycore.conf.dist | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/trinitycore/trinitycore.conf.dist b/src/trinitycore/trinitycore.conf.dist index af81a84038..27253cc875 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) From 72512ed1ee2ebee3b8512c3a82909b5acb8fdf71 Mon Sep 17 00:00:00 2001 From: KingPin Date: Sun, 18 Jan 2009 09:41:54 -0500 Subject: [PATCH 2/4] Some more details for Ace error during build --HG-- branch : trunk --- CMakeLists.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8b64bc192a..a7a4b8a054 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") From 2c119369baddfc41470355ad2435eac451ecdc63 Mon Sep 17 00:00:00 2001 From: KingPin Date: Sun, 18 Jan 2009 09:43:51 -0500 Subject: [PATCH 3/4] CMake fix for scripting library, thanx raczman --HG-- branch : trunk --- src/bindings/interface/CMakeLists.txt | 2 +- src/bindings/scripts/CMakeLists.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/bindings/interface/CMakeLists.txt b/src/bindings/interface/CMakeLists.txt index 4a8f087242..4cffc6446f 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 636530b952..0ee315816e 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) From 0dd0a1cb6f4ad375ebb1ec5b4a1512ef380f26b3 Mon Sep 17 00:00:00 2001 From: KingPin Date: Sun, 18 Jan 2009 09:46:15 -0500 Subject: [PATCH 4/4] More fixes for Cmake by raczman --HG-- branch : trunk --- CMakeLists.txt | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index a7a4b8a054..35e518476d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -156,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)