From fc49fba1073f0eac9e664b35bc74514e9f9719ec Mon Sep 17 00:00:00 2001
From: Michael Jerris <mike@jerris.com>
Date: Wed, 20 Dec 2006 17:55:23 +0000
Subject: [PATCH] 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
---
 Freeswitch.sln                    | 10 ---------
 libs/win32/iksemel/iksemel.vcproj | 36 +++++++++++++++----------------
 2 files changed, 18 insertions(+), 28 deletions(-)

diff --git a/Freeswitch.sln b/Freeswitch.sln
index 3e63272fc5..7664724c94 100644
--- 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}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Download IKSEMEL", "libs\win32\Download IKSEMEL.vcproj", "{F8C28DF9-D76A-449E-A621-D97D869974DA}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "iksemel", "libs\win32\iksemel\iksemel.vcproj", "{E727E8F6-935D-46FE-8B0E-37834748A0E3}"
-	ProjectSection(ProjectDependencies) = postProject
-		{F8C28DF9-D76A-449E-A621-D97D869974DA} = {F8C28DF9-D76A-449E-A621-D97D869974DA}
-	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Download PORTAUDIO", "libs\win32\Download PORTAUDIO.vcproj", "{985135DA-BBE1-42D2-8A85-1F7DF0609B3D}"
 EndProject
@@ -780,10 +775,6 @@ Global
 		{1C469CDD-A3AF-4A94-A592-B2CF12F2D918}.Debug|Win32.Build.0 = Debug|Win32
 		{1C469CDD-A3AF-4A94-A592-B2CF12F2D918}.Release|Win32.ActiveCfg = Release|Win32
 		{1C469CDD-A3AF-4A94-A592-B2CF12F2D918}.Release|Win32.Build.0 = Release|Win32
-		{F8C28DF9-D76A-449E-A621-D97D869974DA}.Debug|Win32.ActiveCfg = Debug|Win32
-		{F8C28DF9-D76A-449E-A621-D97D869974DA}.Debug|Win32.Build.0 = Debug|Win32
-		{F8C28DF9-D76A-449E-A621-D97D869974DA}.Release|Win32.ActiveCfg = Release|Win32
-		{F8C28DF9-D76A-449E-A621-D97D869974DA}.Release|Win32.Build.0 = Release|Win32
 		{E727E8F6-935D-46FE-8B0E-37834748A0E3}.Debug|Win32.ActiveCfg = Debug|Win32
 		{E727E8F6-935D-46FE-8B0E-37834748A0E3}.Debug|Win32.Build.0 = Debug|Win32
 		{E727E8F6-935D-46FE-8B0E-37834748A0E3}.Release|Win32.ActiveCfg = Release|Win32
@@ -1010,7 +1001,6 @@ Global
 		{CBEC7225-0C21-4DA8-978E-1F158F8AD950} = {F69A4A6B-9360-4EBB-A280-22AA3C455AC5}
 		{AB91A099-7690-4ECF-8994-E458F4EA1ED4} = {F69A4A6B-9360-4EBB-A280-22AA3C455AC5}
 		{5C9C69D2-8B98-42DA-8D82-6E0B48446FAC} = {C120A020-773F-4EA3-923F-B67AF28B750D}
-		{F8C28DF9-D76A-449E-A621-D97D869974DA} = {C120A020-773F-4EA3-923F-B67AF28B750D}
 		{985135DA-BBE1-42D2-8A85-1F7DF0609B3D} = {C120A020-773F-4EA3-923F-B67AF28B750D}
 		{5927104D-C14C-4AC8-925C-4AB681762E75} = {C120A020-773F-4EA3-923F-B67AF28B750D}
 		{EFA9E76E-62A5-4237-B7E9-F39B8E174CD5} = {C120A020-773F-4EA3-923F-B67AF28B750D}
diff --git a/libs/win32/iksemel/iksemel.vcproj b/libs/win32/iksemel/iksemel.vcproj
index afae128a65..4bb17de8ea 100644
--- a/libs/win32/iksemel/iksemel.vcproj
+++ b/libs/win32/iksemel/iksemel.vcproj
@@ -40,7 +40,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\iksemel-1.2\include;."
+				AdditionalIncludeDirectories="..\..\iksemel\include;."
 				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -103,7 +103,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\..\iksemel-1.2\include;."
+				AdditionalIncludeDirectories="..\..\iksemel\include;."
 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -149,51 +149,51 @@
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
 			>
 			<File
-				RelativePath="..\..\iksemel-1.2\src\base64.c"
+				RelativePath="..\..\iksemel\src\base64.c"
 				>
 			</File>
 			<File
-				RelativePath="..\..\iksemel-1.2\src\dom.c"
+				RelativePath="..\..\iksemel\src\dom.c"
 				>
 			</File>
 			<File
-				RelativePath="..\..\iksemel-1.2\src\filter.c"
+				RelativePath="..\..\iksemel\src\filter.c"
 				>
 			</File>
 			<File
-				RelativePath="..\..\iksemel-1.2\src\iks.c"
+				RelativePath="..\..\iksemel\src\iks.c"
 				>
 			</File>
 			<File
-				RelativePath="..\..\iksemel-1.2\src\ikstack.c"
+				RelativePath="..\..\iksemel\src\ikstack.c"
 				>
 			</File>
 			<File
-				RelativePath="..\..\iksemel-1.2\src\io-posix.c"
+				RelativePath="..\..\iksemel\src\io-posix.c"
 				>
 			</File>
 			<File
-				RelativePath="..\..\iksemel-1.2\src\jabber.c"
+				RelativePath="..\..\iksemel\src\jabber.c"
 				>
 			</File>
 			<File
-				RelativePath="..\..\iksemel-1.2\src\md5.c"
+				RelativePath="..\..\iksemel\src\md5.c"
 				>
 			</File>
 			<File
-				RelativePath="..\..\iksemel-1.2\src\sax.c"
+				RelativePath="..\..\iksemel\src\sax.c"
 				>
 			</File>
 			<File
-				RelativePath="..\..\iksemel-1.2\src\sha.c"
+				RelativePath="..\..\iksemel\src\sha.c"
 				>
 			</File>
 			<File
-				RelativePath="..\..\iksemel-1.2\src\stream.c"
+				RelativePath="..\..\iksemel\src\stream.c"
 				>
 			</File>
 			<File
-				RelativePath="..\..\iksemel-1.2\src\utility.c"
+				RelativePath="..\..\iksemel\src\utility.c"
 				>
 			</File>
 		</Filter>
@@ -203,19 +203,19 @@
 			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
 			>
 			<File
-				RelativePath="..\..\iksemel-1.2\include\common.h"
+				RelativePath="..\..\iksemel\include\common.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\iksemel-1.2\include\config.h"
+				RelativePath="..\..\iksemel\include\config.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\iksemel-1.2\include\finetune.h"
+				RelativePath="..\..\iksemel\include\finetune.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\iksemel-1.2\include\iksemel.h"
+				RelativePath="..\..\iksemel\include\iksemel.h"
 				>
 			</File>
 		</Filter>