Unwanted changes backed-out.

--HG--
branch : trunk

4 files changed, 13 insertions, 11 deletions

diff --git a/src/shared/revision.h b/src/shared/revision.h
deleted file mode 100644
index a669ec642ea..00000000000
--- a/src/shared/revision.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#ifndef __REVISION_H__
-#define __REVISION_H__
- #define _REVISION "2040"
- #define _HASH "4fae080e5446"
- #define _REVISION_DATE "*"
- #define _REVISION_TIME "*"
-#endif // __REVISION_H__
diff --git a/src/trinityrealm/CMakeLists.txt b/src/trinityrealm/CMakeLists.txt
index cddea04ea47..2a77fb5b074 100644
--- a/src/trinityrealm/CMakeLists.txt
+++ b/src/trinityrealm/CMakeLists.txt
@@ -9,19 +9,25 @@ 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
 shared
@@ -34,6 +40,7 @@ ZThread
 zlib
 ${SSLLIB}
 ${MYSQL_LIBRARIES}
+${OSX_LIBS}
 )
 
 install(TARGETS trinity-realm DESTINATION bin)
diff --git a/src/trinityrealm/RealmList.cpp b/src/trinityrealm/RealmList.cpp
index 936f7bcd703..490850a3631 100644
--- a/src/trinityrealm/RealmList.cpp
+++ b/src/trinityrealm/RealmList.cpp
@@ -50,6 +50,7 @@ void RealmList::UpdateRealm( uint32 ID, const std::string& name, const std::stri
     Realm& realm = m_realms[name];
 
     realm.m_ID      = ID;
+    realm.name      = name;
     realm.icon      = icon;
     realm.color     = color;
     realm.timezone  = timezone;
diff --git a/src/trinityrealm/RealmList.h b/src/trinityrealm/RealmList.h
index b830a0827a7..2d0cee5e992 100644
--- a/src/trinityrealm/RealmList.h
+++ b/src/trinityrealm/RealmList.h
@@ -31,6 +31,7 @@
 struct Realm
 {
     std::string address;
+    std::string name;
     uint8 icon;
     uint8 color;
     uint8 timezone;