From 3faa3c4a0efc3a2d3d3f416d8815a9a73f49e8c6 Mon Sep 17 00:00:00 2001 From: VladimirMangos Date: Fri, 5 Mar 2010 04:44:33 +0300 Subject: [PATCH] [9519] Remove linking mangosd with sockets library. Recent RA reimplementation added by Arrai remove using sockets library for last part mangosd code. This let not link anymore sockets library with mangosd. Now realmd is last sockets library user. --- src/mangosd/Makefile.am | 3 +-- src/shared/revision_nr.h | 2 +- win/mangosdVC100.sln | 1 - win/mangosdVC80.sln | 1 - win/mangosdVC90.sln | 1 - 5 files changed, 2 insertions(+), 6 deletions(-) diff --git a/src/mangosd/Makefile.am b/src/mangosd/Makefile.am index 4d2b641d9a6..fe1ace1e2a7 100644 --- a/src/mangosd/Makefile.am +++ b/src/mangosd/Makefile.am @@ -48,11 +48,10 @@ mangos_worldd_LDADD = \ ../shared/libmangosshared.a \ ../shared/vmap/libmangosvmaps.a \ ../framework/libmangosframework.a \ - ../../dep/src/sockets/libmangossockets.a \ ../../dep/src/g3dlite/libg3dlite.a \ ../../dep/src/gsoap/libgsoap.a -mangos_worldd_LDFLAGS = -L../../dep/src/sockets -L../../dep/src/g3dlite -L../../dep/src/gsoap -L../bindings/universal/ -L$(libdir) $(MANGOS_LIBS) -export-dynamic +mangos_worldd_LDFLAGS = -L../../dep/src/g3dlite -L../../dep/src/gsoap -L../bindings/universal/ -L$(libdir) $(MANGOS_LIBS) -export-dynamic ## Additional files to include when running 'make dist' # Include world daemon configuration diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index 676093f10d7..9efb23b6b4e 100644 --- a/src/shared/revision_nr.h +++ b/src/shared/revision_nr.h @@ -1,4 +1,4 @@ #ifndef __REVISION_NR_H__ #define __REVISION_NR_H__ - #define REVISION_NR "9518" + #define REVISION_NR "9519" #endif // __REVISION_NR_H__ diff --git a/win/mangosdVC100.sln b/win/mangosdVC100.sln index 8c5c46a572b..02dbd0595c8 100644 --- a/win/mangosdVC100.sln +++ b/win/mangosdVC100.sln @@ -19,7 +19,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mangosd", "VC100\mangosd.vc ProjectSection(ProjectDependencies) = postProject {563E9905-3657-460C-AE63-0AC39D162E23} = {563E9905-3657-460C-AE63-0AC39D162E23} {90297C34-F231-4DF4-848E-A74BCC0E40ED} = {90297C34-F231-4DF4-848E-A74BCC0E40ED} - {04BAF755-0D67-46F8-B1C6-77AE5368F3CB} = {04BAF755-0D67-46F8-B1C6-77AE5368F3CB} {1DC6C4DA-A028-41F3-877D-D5400C594F88} = {1DC6C4DA-A028-41F3-877D-D5400C594F88} EndProjectSection EndProject diff --git a/win/mangosdVC80.sln b/win/mangosdVC80.sln index c636b379f46..ea59b29bd18 100644 --- a/win/mangosdVC80.sln +++ b/win/mangosdVC80.sln @@ -18,7 +18,6 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mangosd", "VC80\mangosd.vcproj", "{A3A04E47-43A2-4C08-90B3-029CEF558594}" ProjectSection(ProjectDependencies) = postProject {563E9905-3657-460C-AE63-0AC39D162E23} = {563E9905-3657-460C-AE63-0AC39D162E23} - {04BAF755-0D67-46F8-B1C6-77AE5368F3CB} = {04BAF755-0D67-46F8-B1C6-77AE5368F3CB} {1DC6C4DA-A028-41F3-877D-D5400C594F88} = {1DC6C4DA-A028-41F3-877D-D5400C594F88} {90297C34-F231-4DF4-848E-A74BCC0E40ED} = {90297C34-F231-4DF4-848E-A74BCC0E40ED} EndProjectSection diff --git a/win/mangosdVC90.sln b/win/mangosdVC90.sln index b271296fd03..0a498399181 100644 --- a/win/mangosdVC90.sln +++ b/win/mangosdVC90.sln @@ -18,7 +18,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mangosd", "VC90\mangosd.vcp ProjectSection(ProjectDependencies) = postProject {563E9905-3657-460C-AE63-0AC39D162E23} = {563E9905-3657-460C-AE63-0AC39D162E23} {90297C34-F231-4DF4-848E-A74BCC0E40ED} = {90297C34-F231-4DF4-848E-A74BCC0E40ED} - {04BAF755-0D67-46F8-B1C6-77AE5368F3CB} = {04BAF755-0D67-46F8-B1C6-77AE5368F3CB} {1DC6C4DA-A028-41F3-877D-D5400C594F88} = {1DC6C4DA-A028-41F3-877D-D5400C594F88} EndProjectSection EndProject