From c160e0365178e76d4ba7f9c653ac85532624759a Mon Sep 17 00:00:00 2001 From: paulc Date: Mon, 26 Nov 2007 17:37:24 +0000 Subject: [PATCH] Added more modules to Windows build, fixed some compiler related issues. git-svn-id: http://yate.null.ro/svn/yate/trunk@1494 acf43c95-373e-0410-b603-e72c3f656dc1 --- libs/ysig/isup.cpp | 2 +- windows/Contrib.vcproj | 72 ---------- windows/YATE.sln | 69 +++++++--- windows/_heartbeat.vcproj | 272 +++++++++++++++++++++++++++++++++++++ windows/_mgcpca.vcproj | 274 ++++++++++++++++++++++++++++++++++++++ windows/_mgcpgw.vcproj | 274 ++++++++++++++++++++++++++++++++++++++ windows/libymgcp.vcproj | 205 ++++++++++++++++++++++++++++ 7 files changed, 1077 insertions(+), 91 deletions(-) delete mode 100644 windows/Contrib.vcproj create mode 100644 windows/_heartbeat.vcproj create mode 100644 windows/_mgcpca.vcproj create mode 100644 windows/_mgcpgw.vcproj create mode 100644 windows/libymgcp.vcproj diff --git a/libs/ysig/isup.cpp b/libs/ysig/isup.cpp index 58500fbc..826847aa 100644 --- a/libs/ysig/isup.cpp +++ b/libs/ysig/isup.cpp @@ -1979,8 +1979,8 @@ bool SS7ISUP::setPointCode(SS7PointCode* pc, bool def) SS7PointCode* p = hasPointCode(*pc); if (def) m_defPoint = p ? p : pc; -#ifdef DEBUG String tmp; +#ifdef DEBUG tmp << (def ? *m_defPoint : *pc); #endif if (!p) { diff --git a/windows/Contrib.vcproj b/windows/Contrib.vcproj deleted file mode 100644 index 47a010b1..00000000 --- a/windows/Contrib.vcproj +++ /dev/null @@ -1,72 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/windows/YATE.sln b/windows/YATE.sln index 15ff0788..4eba13ba 100644 --- a/windows/YATE.sln +++ b/windows/YATE.sln @@ -11,21 +11,15 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Console", "Console.vcproj", {254C6F00-6DE5-44A6-AD44-ACABA8912381} = {254C6F00-6DE5-44A6-AD44-ACABA8912381} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Contrib", "Contrib.vcproj", "{0CB4DEF1-6046-46DC-9739-A3F47C456665}" - ProjectSection(ProjectDependencies) = postProject - {496A2084-FFED-4F73-8C85-170042A34F38} = {496A2084-FFED-4F73-8C85-170042A34F38} - {C99A3794-EAF8-4D99-A09B-595ED0F00206} = {C99A3794-EAF8-4D99-A09B-595ED0F00206} - {88B0C2FB-F813-4C85-BCE3-1629A2F8FE09} = {88B0C2FB-F813-4C85-BCE3-1629A2F8FE09} - EndProjectSection -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Extra", "Extra.vcproj", "{B1E0D82A-DB84-4D66-A30D-D028D96D8315}" ProjectSection(ProjectDependencies) = postProject + {A9670DE2-5B1D-403C-9225-75135605C790} = {A9670DE2-5B1D-403C-9225-75135605C790} + {889C65FD-CBA9-4E88-B380-DE2640A140A7} = {889C65FD-CBA9-4E88-B380-DE2640A140A7} {2358F303-8EF4-404A-80C8-6E1826B2D423} = {2358F303-8EF4-404A-80C8-6E1826B2D423} {DC897705-0065-4FA0-B1C2-5A3E75240A95} = {DC897705-0065-4FA0-B1C2-5A3E75240A95} {3EA5873D-E3FA-4CA4-B8BB-8FE4183652A1} = {3EA5873D-E3FA-4CA4-B8BB-8FE4183652A1} {8CF9A752-8606-4819-99D8-CE3C4E744F85} = {8CF9A752-8606-4819-99D8-CE3C4E744F85} {E91BA1B2-C7C3-4DF1-9560-44C8077CFD5F} = {E91BA1B2-C7C3-4DF1-9560-44C8077CFD5F} - {A9670DE2-5B1D-403C-9225-75135605C790} = {A9670DE2-5B1D-403C-9225-75135605C790} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Gtk2Client", "Gtk2Client.vcproj", "{E91BA1B2-C7C3-4DF1-9560-44C8077CFD5F}" @@ -46,11 +40,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Libyate", "Libyate.vcproj", EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Modules", "Modules.vcproj", "{BE362993-354F-4315-B878-05E952E1D164}" ProjectSection(ProjectDependencies) = postProject - {5F248A16-8E3D-497A-8E68-F9E08971F583} = {5F248A16-8E3D-497A-8E68-F9E08971F583} - {42B76F17-895F-4B1C-B783-7AAC92AFD56E} = {42B76F17-895F-4B1C-B783-7AAC92AFD56E} - {34AC2018-91F1-41AF-A839-47DCF27D4434} = {34AC2018-91F1-41AF-A839-47DCF27D4434} - {AA54CD1D-E1E1-4A00-9974-EE6924D85DBD} = {AA54CD1D-E1E1-4A00-9974-EE6924D85DBD} - {125E8721-4B2C-4544-9EE5-8B16883662BE} = {125E8721-4B2C-4544-9EE5-8B16883662BE} {879C9A23-1081-4630-9509-9F0890B70CED} = {879C9A23-1081-4630-9509-9F0890B70CED} {2C0F6C29-318D-4FF6-82EE-49E6418F4C51} = {2C0F6C29-318D-4FF6-82EE-49E6418F4C51} {4490F42E-C4AE-4776-AE4D-490CABA6316E} = {4490F42E-C4AE-4776-AE4D-490CABA6316E} @@ -77,6 +66,16 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Modules", "Modules.vcproj", {A9CA94EB-27BA-46FA-A585-94D36706C4D7} = {A9CA94EB-27BA-46FA-A585-94D36706C4D7} {88C1CCEC-C1AF-4888-A4A1-C0798EDB3947} = {88C1CCEC-C1AF-4888-A4A1-C0798EDB3947} {C296BBF2-AD56-4249-AEF6-C04B03131474} = {C296BBF2-AD56-4249-AEF6-C04B03131474} + {13C976D9-7674-32D3-6612-4B89D4B610BC} = {13C976D9-7674-32D3-6612-4B89D4B610BC} + {5F4005CD-2BA3-40C8-8348-726F5C99D964} = {5F4005CD-2BA3-40C8-8348-726F5C99D964} + {715276DA-C422-9983-5C31-8DE434B610BC} = {715276DA-C422-9983-5C31-8DE434B610BC} + {715210DA-373F-89D2-577E-8DE41AA610BC} = {715210DA-373F-89D2-577E-8DE41AA610BC} + {14D976D9-76B8-48D3-8312-4539D4B610BC} = {14D976D9-76B8-48D3-8312-4539D4B610BC} + {125E8721-4B2C-4544-9EE5-8B16883662BE} = {125E8721-4B2C-4544-9EE5-8B16883662BE} + {AA54CD1D-E1E1-4A00-9974-EE6924D85DBD} = {AA54CD1D-E1E1-4A00-9974-EE6924D85DBD} + {34AC2018-91F1-41AF-A839-47DCF27D4434} = {34AC2018-91F1-41AF-A839-47DCF27D4434} + {42B76F17-895F-4B1C-B783-7AAC92AFD56E} = {42B76F17-895F-4B1C-B783-7AAC92AFD56E} + {5F248A16-8E3D-497A-8E68-F9E08971F583} = {5F248A16-8E3D-497A-8E68-F9E08971F583} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Service", "Service.vcproj", "{B1015F66-0C3D-43DA-8329-15FB43D2F74B}" @@ -332,8 +331,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libyxml", "libyxml.vcproj", EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_ysigchan", "_ysigchan.vcproj", "{14D976D9-76B8-48D3-8312-4539D4B610BC}" ProjectSection(ProjectDependencies) = postProject - {496A2084-FFED-4F73-8C85-170042A34F38} = {496A2084-FFED-4F73-8C85-170042A34F38} {254C6F00-6DE5-44A6-AD44-ACABA8912381} = {254C6F00-6DE5-44A6-AD44-ACABA8912381} + {496A2084-FFED-4F73-8C85-170042A34F38} = {496A2084-FFED-4F73-8C85-170042A34F38} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_analog", "_analog.vcproj", "{13C976D9-7674-32D3-6612-4B89D4B610BC}" @@ -342,6 +341,28 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_analog", "_analog.vcproj", {496A2084-FFED-4F73-8C85-170042A34F38} = {496A2084-FFED-4F73-8C85-170042A34F38} EndProjectSection EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_heartbeat", "_heartbeat.vcproj", "{5F4005CD-2BA3-40C8-8348-726F5C99D964}" + ProjectSection(ProjectDependencies) = postProject + {254C6F00-6DE5-44A6-AD44-ACABA8912381} = {254C6F00-6DE5-44A6-AD44-ACABA8912381} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libymgcp", "libymgcp.vcproj", "{8A30C2FB-E471-9C74-AA33-1629A2F8424E}" + ProjectSection(ProjectDependencies) = postProject + {254C6F00-6DE5-44A6-AD44-ACABA8912381} = {254C6F00-6DE5-44A6-AD44-ACABA8912381} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_mgcpca", "_mgcpca.vcproj", "{715276DA-C422-9983-5C31-8DE434B610BC}" + ProjectSection(ProjectDependencies) = postProject + {8A30C2FB-E471-9C74-AA33-1629A2F8424E} = {8A30C2FB-E471-9C74-AA33-1629A2F8424E} + {254C6F00-6DE5-44A6-AD44-ACABA8912381} = {254C6F00-6DE5-44A6-AD44-ACABA8912381} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_mgcpgw", "_mgcpgw.vcproj", "{715210DA-373F-89D2-577E-8DE41AA610BC}" + ProjectSection(ProjectDependencies) = postProject + {254C6F00-6DE5-44A6-AD44-ACABA8912381} = {254C6F00-6DE5-44A6-AD44-ACABA8912381} + {8A30C2FB-E471-9C74-AA33-1629A2F8424E} = {8A30C2FB-E471-9C74-AA33-1629A2F8424E} + EndProjectSection +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 @@ -356,10 +377,6 @@ Global {F165A72F-E9AE-4804-BD90-81720AC05449}.Debug|Win32.Build.0 = Debug|Win32 {F165A72F-E9AE-4804-BD90-81720AC05449}.Release|Win32.ActiveCfg = Release|Win32 {F165A72F-E9AE-4804-BD90-81720AC05449}.Release|Win32.Build.0 = Release|Win32 - {0CB4DEF1-6046-46DC-9739-A3F47C456665}.Debug|Win32.ActiveCfg = Debug|Win32 - {0CB4DEF1-6046-46DC-9739-A3F47C456665}.Debug|Win32.Build.0 = Debug|Win32 - {0CB4DEF1-6046-46DC-9739-A3F47C456665}.Release|Win32.ActiveCfg = Release|Win32 - {0CB4DEF1-6046-46DC-9739-A3F47C456665}.Release|Win32.Build.0 = Release|Win32 {B1E0D82A-DB84-4D66-A30D-D028D96D8315}.Debug|Win32.ActiveCfg = Debug|Win32 {B1E0D82A-DB84-4D66-A30D-D028D96D8315}.Debug|Win32.Build.0 = Debug|Win32 {B1E0D82A-DB84-4D66-A30D-D028D96D8315}.Release|Win32.ActiveCfg = Release|Win32 @@ -584,6 +601,22 @@ Global {13C976D9-7674-32D3-6612-4B89D4B610BC}.Debug|Win32.Build.0 = Debug|Win32 {13C976D9-7674-32D3-6612-4B89D4B610BC}.Release|Win32.ActiveCfg = Release|Win32 {13C976D9-7674-32D3-6612-4B89D4B610BC}.Release|Win32.Build.0 = Release|Win32 + {5F4005CD-2BA3-40C8-8348-726F5C99D964}.Debug|Win32.ActiveCfg = Debug|Win32 + {5F4005CD-2BA3-40C8-8348-726F5C99D964}.Debug|Win32.Build.0 = Debug|Win32 + {5F4005CD-2BA3-40C8-8348-726F5C99D964}.Release|Win32.ActiveCfg = Release|Win32 + {5F4005CD-2BA3-40C8-8348-726F5C99D964}.Release|Win32.Build.0 = Release|Win32 + {8A30C2FB-E471-9C74-AA33-1629A2F8424E}.Debug|Win32.ActiveCfg = Debug|Win32 + {8A30C2FB-E471-9C74-AA33-1629A2F8424E}.Debug|Win32.Build.0 = Debug|Win32 + {8A30C2FB-E471-9C74-AA33-1629A2F8424E}.Release|Win32.ActiveCfg = Release|Win32 + {8A30C2FB-E471-9C74-AA33-1629A2F8424E}.Release|Win32.Build.0 = Release|Win32 + {715276DA-C422-9983-5C31-8DE434B610BC}.Debug|Win32.ActiveCfg = Debug|Win32 + {715276DA-C422-9983-5C31-8DE434B610BC}.Debug|Win32.Build.0 = Debug|Win32 + {715276DA-C422-9983-5C31-8DE434B610BC}.Release|Win32.ActiveCfg = Release|Win32 + {715276DA-C422-9983-5C31-8DE434B610BC}.Release|Win32.Build.0 = Release|Win32 + {715210DA-373F-89D2-577E-8DE41AA610BC}.Debug|Win32.ActiveCfg = Debug|Win32 + {715210DA-373F-89D2-577E-8DE41AA610BC}.Debug|Win32.Build.0 = Debug|Win32 + {715210DA-373F-89D2-577E-8DE41AA610BC}.Release|Win32.ActiveCfg = Release|Win32 + {715210DA-373F-89D2-577E-8DE41AA610BC}.Release|Win32.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/windows/_heartbeat.vcproj b/windows/_heartbeat.vcproj new file mode 100644 index 00000000..681280a8 --- /dev/null +++ b/windows/_heartbeat.vcproj @@ -0,0 +1,272 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/windows/_mgcpca.vcproj b/windows/_mgcpca.vcproj new file mode 100644 index 00000000..91faab82 --- /dev/null +++ b/windows/_mgcpca.vcproj @@ -0,0 +1,274 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/windows/_mgcpgw.vcproj b/windows/_mgcpgw.vcproj new file mode 100644 index 00000000..326de72e --- /dev/null +++ b/windows/_mgcpgw.vcproj @@ -0,0 +1,274 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/windows/libymgcp.vcproj b/windows/libymgcp.vcproj new file mode 100644 index 00000000..51490b8d --- /dev/null +++ b/windows/libymgcp.vcproj @@ -0,0 +1,205 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +