fix debug build for sofia on windows, use dll version of pthread win32 so it can...

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

diff --git a/Freeswitch.sln b/Freeswitch.sln
index dac29c58a2683dfe3b40c762ec7070bd31c24195..b31843917253ef411800bd12bc48cc747ab4fd82 100644 (file)
--- a/Freeswitch.sln
+++ b/Freeswitch.sln
@@ -891,8 +891,8 @@ Global
                {8B3B4C4C-13C2-446C-BEB0-F412CC2CFB9A}.Debug|Win32.Build.0 = Debug|Win32\r
                {8B3B4C4C-13C2-446C-BEB0-F412CC2CFB9A}.Release|Win32.ActiveCfg = Release|Win32\r
                {8B3B4C4C-13C2-446C-BEB0-F412CC2CFB9A}.Release|Win32.Build.0 = Release|Win32\r
-               {DF018947-0FFF-4EB3-BDEE-441DC81DA7A4}.Debug|Win32.ActiveCfg = Debug|Win32\r
-               {DF018947-0FFF-4EB3-BDEE-441DC81DA7A4}.Debug|Win32.Build.0 = Debug|Win32\r
+               {DF018947-0FFF-4EB3-BDEE-441DC81DA7A4}.Debug|Win32.ActiveCfg = Debug DLL|Win32\r
+               {DF018947-0FFF-4EB3-BDEE-441DC81DA7A4}.Debug|Win32.Build.0 = Debug DLL|Win32\r
                {DF018947-0FFF-4EB3-BDEE-441DC81DA7A4}.Release|Win32.ActiveCfg = Release DLL|Win32\r
                {DF018947-0FFF-4EB3-BDEE-441DC81DA7A4}.Release|Win32.Build.0 = Release DLL|Win32\r
                {FEA1EEF7-876F-48DE-88BF-C0E3E606D758}.Debug|Win32.ActiveCfg = Debug Passthrough|Win32\r
@@ -936,9 +936,9 @@ Global
                {C24FB505-05D7-4319-8485-7540B44C8603} = {E72B5BCB-6462-4D23-B419-3AF1A4AC3D78}\r
                {B5881A85-FE70-4F64-8607-2CAAE52669C6} = {E72B5BCB-6462-4D23-B419-3AF1A4AC3D78}\r
                {2740F45C-475A-4DE0-BCED-6E2E5F6C4B8B} = {E72B5BCB-6462-4D23-B419-3AF1A4AC3D78}\r
-               {3A5B9131-F20C-4A85-9447-6C1610941CEE} = {9460B5F1-0A95-41C4-BEB7-9C2C96459A7C}\r
                {5FD31A25-5D83-4794-8BEE-904DAD84CE71} = {9460B5F1-0A95-41C4-BEB7-9C2C96459A7C}\r
                {FE3540C5-3303-46E0-A69E-D92F775687F1} = {9460B5F1-0A95-41C4-BEB7-9C2C96459A7C}\r
+               {3A5B9131-F20C-4A85-9447-6C1610941CEE} = {9460B5F1-0A95-41C4-BEB7-9C2C96459A7C}\r
                {FFAA4C52-3A53-4F99-90C1-D59D1F0427F3} = {9460B5F1-0A95-41C4-BEB7-9C2C96459A7C}\r
                {0DF3ABD0-DDC0-4265-B778-07C66780979B} = {9460B5F1-0A95-41C4-BEB7-9C2C96459A7C}\r
                {DCC13474-28DF-47CA-A8EB-72F8CE9A78C5} = {2D57D093-3F8D-4729-AD9A-68E945C200A5}\r

diff --git a/libs/win32/pthread/pthread.vcproj b/libs/win32/pthread/pthread.vcproj
index 09d32c8a13f20b35a572a5980897978a86e8dfde..891f60e5e123813240709dad4b8b07c8e254a91b 100644 (file)
--- a/libs/win32/pthread/pthread.vcproj
+++ b/libs/win32/pthread/pthread.vcproj
@@ -131,8 +131,8 @@
                                Optimization="0"\r
                                AdditionalIncludeDirectories="../../pthreads-w32-2-7-0-release/"\r
                                PreprocessorDefinitions="__CLEANUP_C;WIN32;_DEBUG;_WINDOWS;_USRDLL;PTW32_BUILD;_CRT_SECURE_NO_DEPRECATE;PTW32_STATIC_LIB"\r
-                               MinimalRebuild="true"\r
-                               BasicRuntimeChecks="3"\r
+                               MinimalRebuild="false"\r
+                               BasicRuntimeChecks="0"\r
                                RuntimeLibrary="3"\r
                                PrecompiledHeaderFile=".\./pthread.pch"\r
                                AssemblerListingLocation="$(IntDir)\"\r
@@ -178,7 +178,7 @@
                </Configuration>\r
                <Configuration\r
                        Name="Debug DLL|Win32"\r
-                       OutputDirectory="$(ConfigurationName)"\r
+                       OutputDirectory="$(SolutionDir)Debug"\r
                        IntermediateDirectory="$(ConfigurationName)"\r
                        ConfigurationType="2"\r
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"\r
@@ -239,7 +239,7 @@
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalDependencies="ws2_32.lib"\r
-                               OutputFile=".\pthreadVC2.dll"\r
+                               OutputFile="$(OutDir)\pthreadVC2.dll"\r
                                LinkIncremental="2"\r
                                SuppressStartupBanner="true"\r
                                GenerateDebugInformation="true"\r
@@ -278,7 +278,7 @@
                </Configuration>\r
                <Configuration\r
                        Name="Release DLL|Win32"\r
-                       OutputDirectory="$(ConfigurationName)"\r
+                       OutputDirectory="$(SolutionDir)Debug"\r
                        IntermediateDirectory="$(ConfigurationName)"\r
                        ConfigurationType="2"\r
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"\r
@@ -339,7 +339,7 @@
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalDependencies="ws2_32.lib"\r
-                               OutputFile=".\pthreadVC2.dll"\r
+                               OutputFile="$(OutDir)\pthreadVC2.dll"\r
                                LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                ImportLibrary=".\./pthreadVC2.lib"\r