josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix cmake/ACE for freeBSD and Mac OSX

Browse Source 
--HG--
branch : trunk
This commit is contained in:
raczman
2009-02-20 18:22:39 -06:00
parent f1c13a7c79
commit 6f7c53b7f5
7 changed files with 44 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/bindings/scripts/CMakeLists.txt
+4
View File
@@ -383,6 +383,10 @@ add_library(trinityscript SHARED ${trinityscript_LIB_SRCS})
add_definitions(-D_TRINITY_SCRIPT_CONFIG='"${CONF_DIR}/trinitycore.conf"')
IF (CMAKE_SYSTEM_NAME MATCHES "Darwin")
SET_TARGET_PROPERTIES(trinityscript PROPERTIES LINK_FLAGS "-flat_namespace -undefined suppress")
ENDIF (CMAKE_SYSTEM_NAME MATCHES "Darwin")
target_link_libraries(trinityscript)
set_target_properties(trinityscript PROPERTIES VERSION 4.2.0 SOVERSION 4)
src/framework/Platform/Define.h
+7 -2
View File
@@ -60,8 +60,13 @@
# else
# define TRINITY_IMPORT __attribute__ ((cdecl))
# endif //__APPLE_CC__ && BIG_ENDIAN
# define TRINITY_SCRIPT_EXT ".so"
# define TRINITY_SCRIPT_NAME "libtrinityscript"
# if defined(__APPLE_CC__)
# define TRINITY_SCRIPT_EXT ".dylib"
# define TRINITY_SCRIPT_NAME "../lib/libtrinityscript"
# else
# define TRINITY_SCRIPT_EXT ".so"
# define TRINITY_SCRIPT_NAME "libtrinityscript"
# endif //__APPLE_CC__
# define TRINITY_PATH_MAX PATH_MAX
#endif //PLATFORM
src/trinitycore/CMakeLists.txt
+10 -1
View File
@@ -13,15 +13,23 @@ WorldRunnable.cpp
WorldRunnable.h
)
SET(trinity-core_LINK_FLAGS "")
add_executable(trinity-core ${trinity-core_SRCS})
add_definitions(
-D_TRINITY_CORE_CONFIG='"${CONF_DIR}/trinitycore.conf"'
)
IF (DO_MYSQL)
SET_TARGET_PROPERTIES(trinity-core PROPERTIES LINK_FLAGS "-pthread")
SET(trinity-core_LINK_FLAGS "-pthread ${trinity-core_LINK_FLAGS}")
ENDIF(DO_MYSQL)
IF (CMAKE_SYSTEM_NAME MATCHES "Darwin")
SET(trinity-core_LINK_FLAGS "-framework Carbon ${trinity-core_LINK_FLAGS}")
SET(SCRIPT_LIB "")
ENDIF (CMAKE_SYSTEM_NAME MATCHES "Darwin")
SET_TARGET_PROPERTIES(trinity-core PROPERTIES LINK_FLAGS "${trinity-core_LINK_FLAGS}")
target_link_libraries(
trinity-core
@@ -42,6 +50,7 @@ ${POSTGRE_LIBS}
${SSLLIB}
${ACE_LIBRARY}
${ZLIB}
${OSX_LIBS}
)
install(TARGETS trinity-core DESTINATION bin)
src/trinityrealm/CMakeLists.txt
+10 -4
View File
@@ -9,18 +9,24 @@ RealmList.cpp
RealmList.h
)
SET(trinity-realm_LINK_FLAGS "")
add_executable(trinity-realm ${trinity-realm_SRCS})
add_definitions(
-D_TRINITY_REALM_CONFIG='"${CONF_DIR}/trinityrealm.conf"'
)
IF (DO_MYSQL)
#SET_TARGET_PROPERTIES(mangos-realmd PROPERTIES LINK_FLAGS ${MYSQL_LIBS})
SET_TARGET_PROPERTIES(trinity-realm PROPERTIES LINK_FLAGS "-pthread")
SET(trinity-realm_LINK_FLAGS "-pthread ${trinity-realm_LINK_FLAGS}")
ENDIF(DO_MYSQL)
IF (DO_POSTGRE)
SET_TARGET_PROPERTIES(trinity-realmd PROPERTIES LINK_FLAGS ${POSTGRE_LIBS})
SET(trinity-realm_LINK_FLAGS "${POSTGRE_LIBS} ${trinity-realm_LINK_FLAGS}")
ENDIF(DO_POSTGRE)
IF (CMAKE_SYSTEM_NAME MATCHES "Darwin")
SET(trinity-realm_LINK_FLAGS "-framework Carbon ${trinity-realm_LINK_FLAGS}")
ENDIF (CMAKE_SYSTEM_NAME MATCHES "Darwin")
SET_TARGET_PROPERTIES(trinity-realm PROPERTIES LINK_FLAGS "${trinity-realm_LINK_FLAGS}")
target_link_libraries(
trinity-realm
@@ -34,11 +40,11 @@ ZThread
zlib
${SSLLIB}
${MYSQL_LIBRARIES}
${OSX_LIBS}
)
install(TARGETS trinity-realm DESTINATION bin)
########### install files ###############
install(FILES trinityrealm.conf.dist DESTINATION etc)