Author: mikej Date: Fri Oct 6 09:13:28 2006 New Revision: 2988 Modified: freeswitch/trunk/Freeswitch.sln freeswitch/trunk/libs/win32/pthread/pthread.vcproj Log: fix debug build for sofia on windows, use dll version of pthread win32 so it can do the cleanup properly. Modified: freeswitch/trunk/Freeswitch.sln ============================================================================== --- freeswitch/trunk/Freeswitch.sln (original) +++ freeswitch/trunk/Freeswitch.sln Fri Oct 6 09:13:28 2006 @@ -891,8 +891,8 @@ {8B3B4C4C-13C2-446C-BEB0-F412CC2CFB9A}.Debug|Win32.Build.0 = Debug|Win32 {8B3B4C4C-13C2-446C-BEB0-F412CC2CFB9A}.Release|Win32.ActiveCfg = Release|Win32 {8B3B4C4C-13C2-446C-BEB0-F412CC2CFB9A}.Release|Win32.Build.0 = Release|Win32 - {DF018947-0FFF-4EB3-BDEE-441DC81DA7A4}.Debug|Win32.ActiveCfg = Debug|Win32 - {DF018947-0FFF-4EB3-BDEE-441DC81DA7A4}.Debug|Win32.Build.0 = Debug|Win32 + {DF018947-0FFF-4EB3-BDEE-441DC81DA7A4}.Debug|Win32.ActiveCfg = Debug DLL|Win32 + {DF018947-0FFF-4EB3-BDEE-441DC81DA7A4}.Debug|Win32.Build.0 = Debug DLL|Win32 {DF018947-0FFF-4EB3-BDEE-441DC81DA7A4}.Release|Win32.ActiveCfg = Release DLL|Win32 {DF018947-0FFF-4EB3-BDEE-441DC81DA7A4}.Release|Win32.Build.0 = Release DLL|Win32 {FEA1EEF7-876F-48DE-88BF-C0E3E606D758}.Debug|Win32.ActiveCfg = Debug Passthrough|Win32 @@ -936,9 +936,9 @@ {C24FB505-05D7-4319-8485-7540B44C8603} = {E72B5BCB-6462-4D23-B419-3AF1A4AC3D78} {B5881A85-FE70-4F64-8607-2CAAE52669C6} = {E72B5BCB-6462-4D23-B419-3AF1A4AC3D78} {2740F45C-475A-4DE0-BCED-6E2E5F6C4B8B} = {E72B5BCB-6462-4D23-B419-3AF1A4AC3D78} - {3A5B9131-F20C-4A85-9447-6C1610941CEE} = {9460B5F1-0A95-41C4-BEB7-9C2C96459A7C} {5FD31A25-5D83-4794-8BEE-904DAD84CE71} = {9460B5F1-0A95-41C4-BEB7-9C2C96459A7C} {FE3540C5-3303-46E0-A69E-D92F775687F1} = {9460B5F1-0A95-41C4-BEB7-9C2C96459A7C} + {3A5B9131-F20C-4A85-9447-6C1610941CEE} = {9460B5F1-0A95-41C4-BEB7-9C2C96459A7C} {FFAA4C52-3A53-4F99-90C1-D59D1F0427F3} = {9460B5F1-0A95-41C4-BEB7-9C2C96459A7C} {0DF3ABD0-DDC0-4265-B778-07C66780979B} = {9460B5F1-0A95-41C4-BEB7-9C2C96459A7C} {DCC13474-28DF-47CA-A8EB-72F8CE9A78C5} = {2D57D093-3F8D-4729-AD9A-68E945C200A5} Modified: freeswitch/trunk/libs/win32/pthread/pthread.vcproj ============================================================================== --- freeswitch/trunk/libs/win32/pthread/pthread.vcproj (original) +++ freeswitch/trunk/libs/win32/pthread/pthread.vcproj Fri Oct 6 09:13:28 2006 @@ -131,8 +131,8 @@ Optimization="0" AdditionalIncludeDirectories="../../pthreads-w32-2-7-0-release/" PreprocessorDefinitions="__CLEANUP_C;WIN32;_DEBUG;_WINDOWS;_USRDLL;PTW32_BUILD;_CRT_SECURE_NO_DEPRECATE;PTW32_STATIC_LIB" - MinimalRebuild="true" - BasicRuntimeChecks="3" + MinimalRebuild="false" + BasicRuntimeChecks="0" RuntimeLibrary="3" PrecompiledHeaderFile=".\./pthread.pch" AssemblerListingLocation="$(IntDir)\" @@ -178,7 +178,7 @@ </Configuration> <Configuration Name="Debug DLL|Win32" - OutputDirectory="$(ConfigurationName)" + OutputDirectory="$(SolutionDir)Debug" IntermediateDirectory="$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops" @@ -239,7 +239,7 @@ <Tool Name="VCLinkerTool" AdditionalDependencies="ws2_32.lib" - OutputFile=".\pthreadVC2.dll" + OutputFile="$(OutDir)\pthreadVC2.dll" LinkIncremental="2" SuppressStartupBanner="true" GenerateDebugInformation="true" @@ -278,7 +278,7 @@ </Configuration> <Configuration Name="Release DLL|Win32" - OutputDirectory="$(ConfigurationName)" + OutputDirectory="$(SolutionDir)Debug" IntermediateDirectory="$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops" @@ -339,7 +339,7 @@ <Tool Name="VCLinkerTool" AdditionalDependencies="ws2_32.lib" - OutputFile=".\pthreadVC2.dll" + OutputFile="$(OutDir)\pthreadVC2.dll" LinkIncremental="1" SuppressStartupBanner="true" ImportLibrary=".\./pthreadVC2.lib"