4 files changed, 31 insertions, 7 deletions
diff --git a/src/bindings/scripts/CMakeLists.txt b/src/bindings/scripts/CMakeLists.txt
index d908064ca9b..39d7a556fa7 100644
--- a/src/bindings/scripts/CMakeLists.txt
+++ b/src/bindings/scripts/CMakeLists.txt
@@ -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)
diff --git a/src/framework/Platform/Define.h b/src/framework/Platform/Define.h
index cf4fa3e0def..5e0cdfdd179 100644
--- a/src/framework/Platform/Define.h
+++ b/src/framework/Platform/Define.h
@@ -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
 
diff --git a/src/trinitycore/CMakeLists.txt b/src/trinitycore/CMakeLists.txt
index 72ceca8dd33..2c7c4544577 100644
--- a/src/trinitycore/CMakeLists.txt
+++ b/src/trinitycore/CMakeLists.txt
@@ -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)
diff --git a/src/trinityrealm/CMakeLists.txt b/src/trinityrealm/CMakeLists.txt
index cddea04ea47..f883259bbf5 100644
--- a/src/trinityrealm/CMakeLists.txt
+++ b/src/trinityrealm/CMakeLists.txt
@@ -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)