move windows build to use the in tree iksemel

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@3758 d0543943-73ff-0310-b7d9-9358b9ac24b2

diff --git a/Freeswitch.sln b/Freeswitch.sln
index 3e63272fc50ab718ee056518fb6264f24bd9e3c4..7664724c94f9f40ce5b327b214ed42de83c121a4 100644 (file)
--- a/Freeswitch.sln
+++ b/Freeswitch.sln
@@ -372,12 +372,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libspeex", "libs\win32\spee
                {5C9C69D2-8B98-42DA-8D82-6E0B48446FAC} = {5C9C69D2-8B98-42DA-8D82-6E0B48446FAC}\r
        EndProjectSection\r
 EndProject\r
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Download IKSEMEL", "libs\win32\Download IKSEMEL.vcproj", "{F8C28DF9-D76A-449E-A621-D97D869974DA}"\r
-EndProject\r
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "iksemel", "libs\win32\iksemel\iksemel.vcproj", "{E727E8F6-935D-46FE-8B0E-37834748A0E3}"\r
-       ProjectSection(ProjectDependencies) = postProject\r
-               {F8C28DF9-D76A-449E-A621-D97D869974DA} = {F8C28DF9-D76A-449E-A621-D97D869974DA}\r
-       EndProjectSection\r
 EndProject\r
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Download PORTAUDIO", "libs\win32\Download PORTAUDIO.vcproj", "{985135DA-BBE1-42D2-8A85-1F7DF0609B3D}"\r
 EndProject\r
@@ -780,10 +775,6 @@ Global
                {1C469CDD-A3AF-4A94-A592-B2CF12F2D918}.Debug|Win32.Build.0 = Debug|Win32\r
                {1C469CDD-A3AF-4A94-A592-B2CF12F2D918}.Release|Win32.ActiveCfg = Release|Win32\r
                {1C469CDD-A3AF-4A94-A592-B2CF12F2D918}.Release|Win32.Build.0 = Release|Win32\r
-               {F8C28DF9-D76A-449E-A621-D97D869974DA}.Debug|Win32.ActiveCfg = Debug|Win32\r
-               {F8C28DF9-D76A-449E-A621-D97D869974DA}.Debug|Win32.Build.0 = Debug|Win32\r
-               {F8C28DF9-D76A-449E-A621-D97D869974DA}.Release|Win32.ActiveCfg = Release|Win32\r
-               {F8C28DF9-D76A-449E-A621-D97D869974DA}.Release|Win32.Build.0 = Release|Win32\r
                {E727E8F6-935D-46FE-8B0E-37834748A0E3}.Debug|Win32.ActiveCfg = Debug|Win32\r
                {E727E8F6-935D-46FE-8B0E-37834748A0E3}.Debug|Win32.Build.0 = Debug|Win32\r
                {E727E8F6-935D-46FE-8B0E-37834748A0E3}.Release|Win32.ActiveCfg = Release|Win32\r
@@ -1010,7 +1001,6 @@ Global
                {CBEC7225-0C21-4DA8-978E-1F158F8AD950} = {F69A4A6B-9360-4EBB-A280-22AA3C455AC5}\r
                {AB91A099-7690-4ECF-8994-E458F4EA1ED4} = {F69A4A6B-9360-4EBB-A280-22AA3C455AC5}\r
                {5C9C69D2-8B98-42DA-8D82-6E0B48446FAC} = {C120A020-773F-4EA3-923F-B67AF28B750D}\r
-               {F8C28DF9-D76A-449E-A621-D97D869974DA} = {C120A020-773F-4EA3-923F-B67AF28B750D}\r
                {985135DA-BBE1-42D2-8A85-1F7DF0609B3D} = {C120A020-773F-4EA3-923F-B67AF28B750D}\r
                {5927104D-C14C-4AC8-925C-4AB681762E75} = {C120A020-773F-4EA3-923F-B67AF28B750D}\r
                {EFA9E76E-62A5-4237-B7E9-F39B8E174CD5} = {C120A020-773F-4EA3-923F-B67AF28B750D}\r

diff --git a/libs/win32/iksemel/iksemel.vcproj b/libs/win32/iksemel/iksemel.vcproj
index afae128a650a180e1046ec12f5d4dfd27ef3747b..4bb17de8ea3b274e12505c23ea35ef0a11956b12 100644 (file)
--- a/libs/win32/iksemel/iksemel.vcproj
+++ b/libs/win32/iksemel/iksemel.vcproj
@@ -40,7 +40,7 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories="..\..\iksemel-1.2\include;."\r
+                               AdditionalIncludeDirectories="..\..\iksemel\include;."\r
                                PreprocessorDefinitions="WIN32;_DEBUG;_LIB;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"\r
                                MinimalRebuild="true"\r
                                BasicRuntimeChecks="3"\r
@@ -103,7 +103,7 @@
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               AdditionalIncludeDirectories="..\..\iksemel-1.2\include;."\r
+                               AdditionalIncludeDirectories="..\..\iksemel\include;."\r
                                PreprocessorDefinitions="WIN32;NDEBUG;_LIB;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"\r
                                RuntimeLibrary="2"\r
                                UsePrecompiledHeader="0"\r
@@ -149,51 +149,51 @@
                        UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"\r
                        >\r
                        <File\r
-                               RelativePath="..\..\iksemel-1.2\src\base64.c"\r
+                               RelativePath="..\..\iksemel\src\base64.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\iksemel-1.2\src\dom.c"\r
+                               RelativePath="..\..\iksemel\src\dom.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\iksemel-1.2\src\filter.c"\r
+                               RelativePath="..\..\iksemel\src\filter.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\iksemel-1.2\src\iks.c"\r
+                               RelativePath="..\..\iksemel\src\iks.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\iksemel-1.2\src\ikstack.c"\r
+                               RelativePath="..\..\iksemel\src\ikstack.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\iksemel-1.2\src\io-posix.c"\r
+                               RelativePath="..\..\iksemel\src\io-posix.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\iksemel-1.2\src\jabber.c"\r
+                               RelativePath="..\..\iksemel\src\jabber.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\iksemel-1.2\src\md5.c"\r
+                               RelativePath="..\..\iksemel\src\md5.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\iksemel-1.2\src\sax.c"\r
+                               RelativePath="..\..\iksemel\src\sax.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\iksemel-1.2\src\sha.c"\r
+                               RelativePath="..\..\iksemel\src\sha.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\iksemel-1.2\src\stream.c"\r
+                               RelativePath="..\..\iksemel\src\stream.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\iksemel-1.2\src\utility.c"\r
+                               RelativePath="..\..\iksemel\src\utility.c"\r
                                >\r
                        </File>\r
                </Filter>\r
@@ -203,19 +203,19 @@
                        UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"\r
                        >\r
                        <File\r
-                               RelativePath="..\..\iksemel-1.2\include\common.h"\r
+                               RelativePath="..\..\iksemel\include\common.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\iksemel-1.2\include\config.h"\r
+                               RelativePath="..\..\iksemel\include\config.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\iksemel-1.2\include\finetune.h"\r
+                               RelativePath="..\..\iksemel\include\finetune.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\iksemel-1.2\include\iksemel.h"\r
+                               RelativePath="..\..\iksemel\include\iksemel.h"\r
                                >\r
                        </File>\r
                </Filter>\r