diff options
| author | Neo2003 <none@none> | 2008-10-04 06:17:19 -0500 |
|---|---|---|
| committer | Neo2003 <none@none> | 2008-10-04 06:17:19 -0500 |
| commit | 5651828bf74edb760d67700942fc65d51c816e0a (patch) | |
| tree | 1631f319bbc293794109f990beaccfd5b6cee8fe /src/trinityrealm | |
| parent | ca7a4bf1a78a1ddc6eb21238cc2a1633194a11cc (diff) | |
[svn] * Added ACE for Linux and Windows (Thanks Derex for Linux part and partial Windows part)
* Updated to 6721 and 676
* Fixed TrinityScript logo
* Version updated to 0.2.6721.676
--HG--
branch : trunk
rename : 6700-670 => 6721-676
Diffstat (limited to 'src/trinityrealm')
| -rw-r--r-- | src/trinityrealm/Makefile.am | 3 | ||||
| -rw-r--r-- | src/trinityrealm/TrinityRealm.rc | 8 |
2 files changed, 7 insertions, 4 deletions
diff --git a/src/trinityrealm/Makefile.am b/src/trinityrealm/Makefile.am index bd4c487afd3..e8ba49aa509 100644 --- a/src/trinityrealm/Makefile.am +++ b/src/trinityrealm/Makefile.am @@ -24,6 +24,8 @@ trinity_realm_CPPFLAGS = \ $(MYSQL_INCLUDES) \ $(POSTGRE_INCLUDES) \ -I$(top_srcdir)/dep/include \ +-I$(top_srcdir)/dep/ACE_wrappers \ +-I$(top_builddir)/dep/ACE_wrappers \ -I$(top_srcdir)/src/framework \ -I$(top_srcdir)/src/shared \ -D_TRINITY_REALM_CONFIG='"$(sysconfdir)/trinityrealm.conf"' @@ -42,6 +44,7 @@ trinity_realm_LDADD = \ $(top_builddir)/src/shared/libshared.a \ $(top_builddir)/src/framework/libmangosframework.a \ $(top_builddir)/dep/src/sockets/libmangossockets.a \ +$(top_builddir)/dep/ACE_wrappers/ace/libACE.la \ $(top_builddir)/dep/src/zthread/libZThread.la ## Linker flags diff --git a/src/trinityrealm/TrinityRealm.rc b/src/trinityrealm/TrinityRealm.rc index b795af70740..b2a9d6a8f8b 100644 --- a/src/trinityrealm/TrinityRealm.rc +++ b/src/trinityrealm/TrinityRealm.rc @@ -52,8 +52,8 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_SYS_DEFAULT // VS_VERSION_INFO VERSIONINFO - FILEVERSION 0,1,6700,670 - PRODUCTVERSION 0,1,6700,670 + FILEVERSION 0,2,6721,676 + PRODUCTVERSION 0,2,6721,676 FILEFLAGSMASK 0x17L #ifdef _DEBUG FILEFLAGS 0x1L @@ -69,12 +69,12 @@ BEGIN BLOCK "080004b0" BEGIN VALUE "FileDescription", "TrinityRealm" - VALUE "FileVersion", "0, 1, 6700, 670" + VALUE "FileVersion", "0, 2, 6721, 676" VALUE "InternalName", "TrinityRealm" VALUE "LegalCopyright", "Copyright (C) 2008" VALUE "OriginalFilename", "TrinityRealm.exe" VALUE "ProductName", "TrinityRealm" - VALUE "ProductVersion", "0, 1, 6700, 670" + VALUE "ProductVersion", "0, 2, 6721, 676" END END BLOCK "VarFileInfo" |