From 7af395ef83cd321f6a6e9d2795fbef9fdc562fce Mon Sep 17 00:00:00 2001 From: Jeff Lenk Date: Sat, 10 Jul 2010 15:22:25 -0500 Subject: [PATCH 01/10] more tweaks for VS2010 --- .../broadvoice/src/libbroadvoice.2010.vcxproj | 33 +----- libs/esl/src/esl.2010.vcxproj | 24 +---- libs/ilbc/libilbc.2010.vcxproj | 24 +---- libs/libdingaling/libdingaling.2010.vcxproj | 24 +---- libs/libteletone/libteletone.2010.vcxproj | 36 +------ .../build/msvc/portaudio.2010.vcxproj | 46 +------- libs/silk/src/Silk_FIX.2010.vcxproj | 36 +------ libs/spandsp/src/libspandsp.2010.vcxproj | 40 +------ libs/spandsp/src/libtiff.2010.vcxproj | 30 ++---- .../win32/VS2008/libspeex/libspeex.vcxproj | 26 +---- .../VS2008/libspeexdsp/libspeexdsp.vcxproj | 28 +---- libs/srtp/libsrtp.2010.vcxproj | 53 +--------- libs/win32/Dowload 32khz Sounds.2010.vcxproj | 11 +- libs/win32/Dowload 32khz music.2010.vcxproj | 11 +- libs/win32/Download 16khz Sounds.2010.vcxproj | 11 +- libs/win32/Download 16khz music.2010.vcxproj | 11 +- libs/win32/Download 8khz Sounds.2010.vcxproj | 6 +- libs/win32/Download 8khz music.2010.vcxproj | 11 +- libs/win32/Download CELT.vcxproj | 11 +- libs/win32/Download FLITE.2010.vcxproj | 11 +- libs/win32/Download JSON.2010.vcxproj | 11 +- libs/win32/Download LAME.2010.vcxproj | 11 +- libs/win32/Download LIBSHOUT.2010.vcxproj | 11 +- libs/win32/Download OGG.2010.vcxproj | 11 +- libs/win32/Download PTHREAD.2010.vcxproj | 11 +- libs/win32/Download mpg123.2010.vcxproj | 11 +- libs/win32/Download pocketsphinx.2010.vcxproj | 11 +- libs/win32/Download sphinxbase.2010.vcxproj | 11 +- libs/win32/Download sphinxmodel.2010.vcxproj | 11 +- libs/win32/apr-util/libaprutil.2010.vcxproj | 35 +----- libs/win32/apr-util/xml.2010.vcxproj | 44 ++------ libs/win32/apr/libapr.2010.vcxproj | 30 +----- libs/win32/celt/libcelt.vcxproj | 24 +---- libs/win32/curl/curllib.2010.vcxproj | 26 +---- libs/win32/flite/flite.2010.vcxproj | 16 +-- libs/win32/iksemel/iksemel.2010.vcxproj | 24 +---- libs/win32/js/js.2010.vcxproj | 54 +--------- libs/win32/json/libjson.2010.vcxproj | 24 +---- libs/win32/libg722_1/libg722_1.vcxproj | 28 +---- libs/win32/libmp3lame/libmp3lame.2010.vcxproj | 28 +---- libs/win32/libogg/libogg.2010.vcxproj | 24 +---- libs/win32/libshout/libshout.vcxproj | 24 +---- libs/win32/libsndfile/libsndfile.2010.vcxproj | 24 +---- libs/win32/mpg123/libmpg123.2010.vcxproj | 30 +----- libs/win32/pcre/libpcre.2010.vcxproj | 100 +----------------- .../pocketsphinx/pocketsphinx.2010.vcxproj | 46 +------- libs/win32/pthread/pthread.2010.vcxproj | 62 ++--------- .../sofia/libsofia_sip_ua_static.2010.vcxproj | 22 +--- libs/win32/sphinxbase/sphinxbase.2010.vcxproj | 57 +--------- libs/win32/sqlite/sqlite.2010.vcxproj | 24 +---- libs/win32/udns/libudns.2010.vcxproj | 24 +---- libs/xmlrpc-c/Windows/abyss.2010.vcxproj | 32 ++---- libs/xmlrpc-c/Windows/xmlparse.2010.vcxproj | 16 +-- libs/xmlrpc-c/Windows/xmlrpc.2010.vcxproj | 18 ++-- libs/xmlrpc-c/Windows/xmltok.2010.vcxproj | 18 ++-- .../mod_ldap/mod_ldap.2010.vcxproj | 2 - .../languages/mod_lua/lua/lua.2010.vcxproj | 44 +------- w32/extdll.props | 12 +++ w32/extlib.props | 12 +++ 59 files changed, 242 insertions(+), 1264 deletions(-) create mode 100644 w32/extdll.props create mode 100644 w32/extlib.props diff --git a/libs/broadvoice/src/libbroadvoice.2010.vcxproj b/libs/broadvoice/src/libbroadvoice.2010.vcxproj index e5b584a381..adbb6d7b28 100644 --- a/libs/broadvoice/src/libbroadvoice.2010.vcxproj +++ b/libs/broadvoice/src/libbroadvoice.2010.vcxproj @@ -48,30 +48,26 @@ + + + + <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)$(PlatformName)\$(Configuration)\ - $(Configuration)\ true - $(SolutionDir)$(PlatformName)\$(Configuration)\ - $(Configuration)\ false - $(SolutionDir)$(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ true - $(SolutionDir)$(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ false @@ -82,18 +78,13 @@ true EnableFastChecks MultiThreadedDebugDLL - - Level4 - EditAndContinue CompileAsC true Windows false - - MachineX86 @@ -102,10 +93,7 @@ .; .\floating\common; .\floating\bv16; .\floating\bv32; .\broadvoice; .\msvc;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;BROADVOICE_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;HAVE_TGMATH_H;%(PreprocessorDefinitions) MultiThreadedDLL - - Level4 - ProgramDatabase true @@ -113,8 +101,6 @@ true true false - - MachineX86 @@ -129,18 +115,12 @@ true EnableFastChecks MultiThreadedDebugDLL - - - Level4 - ProgramDatabase CompileAsC true Windows false - - MachineX64 @@ -152,10 +132,7 @@ .; .\floating\common; .\floating\bv16; .\floating\bv32; .\broadvoice; .\msvc;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;BROADVOICE_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;HAVE_TGMATH_H;%(PreprocessorDefinitions) MultiThreadedDLL - - Level4 - ProgramDatabase true @@ -163,8 +140,6 @@ true true false - - MachineX64 diff --git a/libs/esl/src/esl.2010.vcxproj b/libs/esl/src/esl.2010.vcxproj index ed7b6ea890..b215fe4bc8 100644 --- a/libs/esl/src/esl.2010.vcxproj +++ b/libs/esl/src/esl.2010.vcxproj @@ -48,27 +48,23 @@ + + + + <_ProjectFileVersion>10.0.30319.1 - $(PlatformName)\$(Configuration)\ - $(PlatformName)\$(Configuration)\ - $(PlatformName)\$(Configuration)\ - $(PlatformName)\$(Configuration)\ - $(PlatformName)\$(Configuration)\ - $(PlatformName)\$(Configuration)\ - $(PlatformName)\$(Configuration)\ - $(PlatformName)\$(Configuration)\ @@ -78,11 +74,8 @@ true EnableFastChecks MultiThreadedDebugDLL - - Level4 true - ProgramDatabase 4706;4100;%(DisableSpecificWarnings) true @@ -98,11 +91,8 @@ true EnableFastChecks MultiThreadedDebugDLL - - Level4 false - ProgramDatabase 4706;4100;%(DisableSpecificWarnings) true @@ -112,11 +102,8 @@ include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;ESL_DECLARE_STATIC;%(PreprocessorDefinitions) MultiThreadedDLL - - Level4 true - ProgramDatabase 4706;4100;%(DisableSpecificWarnings) true @@ -129,11 +116,8 @@ include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;ESL_DECLARE_STATIC;%(PreprocessorDefinitions) MultiThreadedDLL - - Level4 false - ProgramDatabase 4706;4100;%(DisableSpecificWarnings) true diff --git a/libs/ilbc/libilbc.2010.vcxproj b/libs/ilbc/libilbc.2010.vcxproj index ad2a0c3ccb..efd9bee214 100644 --- a/libs/ilbc/libilbc.2010.vcxproj +++ b/libs/ilbc/libilbc.2010.vcxproj @@ -48,27 +48,23 @@ + + + + <_ProjectFileVersion>10.0.30319.1 - $(PlatformName)\$(Configuration)\ - $(PlatformName)\$(Configuration)\ - $(PlatformName)\$(Configuration)\ - $(PlatformName)\$(Configuration)\ - $(PlatformName)\$(Configuration)\ - $(PlatformName)\$(Configuration)\ - $(PlatformName)\$(Configuration)\ - $(PlatformName)\$(Configuration)\ @@ -78,10 +74,7 @@ true EnableFastChecks MultiThreadedDebugDLL - - Level4 - ProgramDatabase 4127;%(DisableSpecificWarnings) @@ -90,10 +83,7 @@ src; src\ilbc; src\msvc;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBilbc_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions) MultiThreadedDLL - - Level4 - ProgramDatabase 4127;%(DisableSpecificWarnings) @@ -108,10 +98,7 @@ true EnableFastChecks MultiThreadedDebugDLL - - Level4 - ProgramDatabase 4127;%(DisableSpecificWarnings) @@ -123,10 +110,7 @@ src; src\ilbc; src\msvc;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBilbc_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions) MultiThreadedDLL - - Level4 - ProgramDatabase 4127;%(DisableSpecificWarnings) diff --git a/libs/libdingaling/libdingaling.2010.vcxproj b/libs/libdingaling/libdingaling.2010.vcxproj index 1e8c0bc008..06cc1ad15f 100644 --- a/libs/libdingaling/libdingaling.2010.vcxproj +++ b/libs/libdingaling/libdingaling.2010.vcxproj @@ -88,9 +88,11 @@ + + @@ -100,25 +102,19 @@ + + <_ProjectFileVersion>10.0.30319.1 - $(Configuration)\ - $(Configuration)\ - $(Configuration)\ - $(Configuration)\ $(SolutionDir)Debug\ $(Configuration)\ $(SolutionDir)Release\ $(Configuration)\ - $(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ $(SolutionDir)$(Platform)\$(Configuration)\ $(Platform)\$(Configuration)\ $(SolutionDir)$(Platform)\$(Configuration)\ @@ -132,10 +128,7 @@ true EnableFastChecks MultiThreadedDebugDLL - - Level4 - ProgramDatabase 4100;4706;%(DisableSpecificWarnings) @@ -144,10 +137,7 @@ .;.\src;..\iksemel\include;..\include;..\apr\include;..\iksemel-1.2\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions) MultiThreadedDLL - - Level4 - ProgramDatabase 4100;%(DisableSpecificWarnings) @@ -208,10 +198,7 @@ true EnableFastChecks MultiThreadedDebugDLL - - Level4 - ProgramDatabase 4100;4706;%(DisableSpecificWarnings) @@ -223,10 +210,7 @@ .;.\src;..\iksemel\include;..\include;..\apr\include;..\iksemel-1.2\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions) MultiThreadedDLL - - Level4 - ProgramDatabase 4100;%(DisableSpecificWarnings) diff --git a/libs/libteletone/libteletone.2010.vcxproj b/libs/libteletone/libteletone.2010.vcxproj index 86abfbe405..e8335ddd41 100644 --- a/libs/libteletone/libteletone.2010.vcxproj +++ b/libs/libteletone/libteletone.2010.vcxproj @@ -48,27 +48,23 @@ + + + + <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)$(PlatformName)\$(Configuration)\ - $(Configuration)\ - $(SolutionDir)$(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - $(SolutionDir)$(PlatformName)\$(Configuration)\ - $(Configuration)\ - $(SolutionDir)$(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ @@ -78,11 +74,8 @@ true EnableFastChecks MultiThreadedDebugDLL - - Level4 true - EditAndContinue true @@ -90,9 +83,6 @@ false false false - - - $(IntDir)$(TargetName).lib true @@ -107,11 +97,8 @@ true EnableFastChecks MultiThreadedDebugDLL - - Level4 true - ProgramDatabase true @@ -119,9 +106,6 @@ false false false - - - $(IntDir)$(TargetName).lib MachineX64 true @@ -131,19 +115,13 @@ src;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;TELETONE_EXPORTS;%(PreprocessorDefinitions) MultiThreadedDLL - - Level4 true - ProgramDatabase true $(ProjectDir)teletone.def false - - - $(IntDir)$(TargetName).lib @@ -154,19 +132,13 @@ src;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;TELETONE_EXPORTS;%(PreprocessorDefinitions) MultiThreadedDLL - - Level4 true - ProgramDatabase true $(ProjectDir)teletone.def false - - - $(IntDir)$(TargetName).lib MachineX64 diff --git a/libs/portaudio/build/msvc/portaudio.2010.vcxproj b/libs/portaudio/build/msvc/portaudio.2010.vcxproj index c7563d0bed..b4eca56713 100644 --- a/libs/portaudio/build/msvc/portaudio.2010.vcxproj +++ b/libs/portaudio/build/msvc/portaudio.2010.vcxproj @@ -83,9 +83,11 @@ + + @@ -98,22 +100,16 @@ + + <_ProjectFileVersion>10.0.30319.1 - $(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ $(Configuration)\ $(Configuration)\ true @@ -133,9 +129,6 @@ true true Win32 - .\Release_x86/portaudio.tlb - - Disabled @@ -145,10 +138,6 @@ true MultiThreadedDLL true - $(Platform)\$(Configuration)/portaudio.pch - $(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ Level3 true @@ -158,7 +147,6 @@ true - $(Platform)\$(Configuration)\portaudio.bsc @@ -167,9 +155,6 @@ true true X64 - .\Release_x86/portaudio.tlb - - MaxSpeed @@ -179,10 +164,6 @@ true MultiThreadedDLL true - $(Platform)\$(Configuration)\portaudio.pch - $(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ Level3 true @@ -192,7 +173,6 @@ true - $(Platform)\$(Configuration)\portaudio_x64.bsc @@ -201,9 +181,6 @@ true true Win32 - .\Debug_x86/portaudio.tlb - - Disabled @@ -212,13 +189,8 @@ true EnableFastChecks MultiThreadedDebugDLL - $(Platform)\$(Configuration)/portaudio.pch - $(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ Level3 true - ProgramDatabase _DEBUG;%(PreprocessorDefinitions) @@ -226,7 +198,6 @@ true - $(Platform)\$(Configuration)\portaudio.bsc @@ -235,9 +206,6 @@ true true X64 - .\Debug_x86/portaudio.tlb - - Disabled @@ -246,13 +214,8 @@ true EnableFastChecks MultiThreadedDebugDLL - $(Platform)\$(Configuration)\portaudio.pch - $(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ Level3 true - ProgramDatabase _DEBUG;%(PreprocessorDefinitions) @@ -260,7 +223,6 @@ true - $(Platform)\$(Configuration)/portaudio_x64.bsc diff --git a/libs/silk/src/Silk_FIX.2010.vcxproj b/libs/silk/src/Silk_FIX.2010.vcxproj index 8d341b50e1..a08d7357b0 100644 --- a/libs/silk/src/Silk_FIX.2010.vcxproj +++ b/libs/silk/src/Silk_FIX.2010.vcxproj @@ -48,27 +48,23 @@ + + + + <_ProjectFileVersion>10.0.30319.1 - $(Configuration)\ - $(Configuration)\ - $(Configuration)\ - $(Configuration)\ - $(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ @@ -80,15 +76,8 @@ EnableFastChecks MultiThreadedDebug Fast - - Level3 - EditAndContinue - - - - @@ -101,15 +90,8 @@ false MultiThreaded Fast - - Level3 - ProgramDatabase - - - - @@ -124,10 +106,7 @@ EnableFastChecks MultiThreadedDebug Fast - - Level3 - ProgramDatabase @@ -148,15 +127,8 @@ false MultiThreaded Fast - - Level3 - ProgramDatabase - - - - diff --git a/libs/spandsp/src/libspandsp.2010.vcxproj b/libs/spandsp/src/libspandsp.2010.vcxproj index 82472a9a8d..dd5b5d97fa 100644 --- a/libs/spandsp/src/libspandsp.2010.vcxproj +++ b/libs/spandsp/src/libspandsp.2010.vcxproj @@ -48,30 +48,26 @@ + + + + <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)$(PlatformName)\$(Configuration)\ - $(Configuration)\ true - $(SolutionDir)$(PlatformName)\$(Configuration)\ - $(Configuration)\ false - $(SolutionDir)$(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ true - $(SolutionDir)$(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ false @@ -85,11 +81,7 @@ true EnableFastChecks MultiThreadedDebugDLL - - - $(IntDir)$(TargetName).pdb Level4 - EditAndContinue CompileAsC 4127;%(DisableSpecificWarnings) @@ -97,9 +89,6 @@ true Windows false - - - ./Debug\spandsp.lib MachineX86 @@ -111,11 +100,7 @@ .;.\spandsp;.\msvc;..\..\tiff-3.8.2\libtiff;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBSPANDSP_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;HAVE_CONFIG_H;%(PreprocessorDefinitions) MultiThreadedDLL - - - $(IntDir)$(TargetName).pdb Level4 - ProgramDatabase 4127;%(DisableSpecificWarnings) @@ -124,9 +109,6 @@ true true false - - - ./Release\spandsp.lib MachineX86 @@ -141,11 +123,7 @@ true EnableFastChecks MultiThreadedDebugDLL - - - $(IntDir)$(TargetName).pdb Level4 - ProgramDatabase CompileAsC 4127;%(DisableSpecificWarnings) @@ -153,9 +131,6 @@ true Windows false - - - $(TargetDir)spandsp.lib MachineX64 @@ -167,11 +142,7 @@ .;.\spandsp;.\msvc;..\..\tiff-3.8.2\libtiff;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBSPANDSP_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;HAVE_CONFIG_H;%(PreprocessorDefinitions) MultiThreadedDLL - - - $(IntDir)$(TargetName).pdb Level4 - ProgramDatabase 4127;%(DisableSpecificWarnings) @@ -180,9 +151,6 @@ true true false - - - $(TargetDir)spandsp.lib MachineX64 diff --git a/libs/spandsp/src/libtiff.2010.vcxproj b/libs/spandsp/src/libtiff.2010.vcxproj index e8ec32245d..03d2d0b78e 100644 --- a/libs/spandsp/src/libtiff.2010.vcxproj +++ b/libs/spandsp/src/libtiff.2010.vcxproj @@ -48,27 +48,27 @@ + + + + <_ProjectFileVersion>10.0.30319.1 - $(PlatformName)\$(Configuration)\ - $(PlatformName)\$(Configuration)\ - $(PlatformName)\$(Configuration)\ - $(PlatformName)\$(Configuration)\ - $(PlatformName)\$(Configuration)\ - $(PlatformName)\$(Configuration)\ - $(PlatformName)\$(Configuration)\ - $(PlatformName)\$(Configuration)\ + $(PlatformName)\libtiff\$(Configuration)\ + $(PlatformName)\libtiff\$(Configuration)\ + $(PlatformName)\libtiff\$(Configuration)\ + $(PlatformName)\libtiff\$(Configuration)\ @@ -86,11 +86,7 @@ if not exist "$(ProjectDir)../../tiff-3.8.2/libtiff/tif_config.h" copy "$(Projec true EnableFastChecks MultiThreadedDebugDLL - - - $(IntDir)$(TargetName).pdb TurnOffAllWarnings - EditAndContinue CompileAsC @@ -110,10 +106,7 @@ if not exist "$(ProjectDir)../../tiff-3.8.2/libtiff/tif_config.h" copy "$(Projec true EnableFastChecks MultiThreadedDebugDLL - - TurnOffAllWarnings - ProgramDatabase CompileAsC @@ -130,11 +123,7 @@ if not exist "$(ProjectDir)../../tiff-3.8.2/libtiff/tif_config.h" copy "$(Projec .;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;FILLODER_LSB2MSB;TIF_PLATFORM_CONSOLE;CCITT_SUPPORT;PACKBITS_SUPPORT;LZW_SUPPORT;THUNDER_SUPPORT;NEXT_SUPPORT;LOGLUV_SUPPORT;TRIPCHOP_DEFAULT=TIFF_STRIPCHOP;STRIP_SIZE_DEFAULT=8192;DEFAULT_EXTRASAMPLE_AS_ALPHA;CHECK_JPEG_YCBCR_SUBSAMPLING;AVOID_WIN32_FILEIO;%(PreprocessorDefinitions) MultiThreadedDLL - - - $(IntDir)$(TargetName).pdb TurnOffAllWarnings - ProgramDatabase @@ -150,10 +139,7 @@ if not exist "$(ProjectDir)../../tiff-3.8.2/libtiff/tif_config.h" copy "$(Projec .;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;FILLODER_LSB2MSB;TIF_PLATFORM_CONSOLE;CCITT_SUPPORT;PACKBITS_SUPPORT;LZW_SUPPORT;THUNDER_SUPPORT;NEXT_SUPPORT;LOGLUV_SUPPORT;TRIPCHOP_DEFAULT=TIFF_STRIPCHOP;STRIP_SIZE_DEFAULT=8192;DEFAULT_EXTRASAMPLE_AS_ALPHA;CHECK_JPEG_YCBCR_SUBSAMPLING;AVOID_WIN32_FILEIO;%(PreprocessorDefinitions) MultiThreadedDLL - - TurnOffAllWarnings - ProgramDatabase diff --git a/libs/speex/win32/VS2008/libspeex/libspeex.vcxproj b/libs/speex/win32/VS2008/libspeex/libspeex.vcxproj index 551481a3b1..acc04fee78 100644 --- a/libs/speex/win32/VS2008/libspeex/libspeex.vcxproj +++ b/libs/speex/win32/VS2008/libspeex/libspeex.vcxproj @@ -156,10 +156,12 @@ + + @@ -184,18 +186,16 @@ + + <_ProjectFileVersion>10.0.30319.1 - $(PlatformName)\$(Configuration)\ - $(PlatformName)\$(Configuration)\ - $(PlatformName)\$(Configuration)\ - $(PlatformName)\$(Configuration)\ $(Configuration)\ $(Configuration)\ $(Configuration)\ @@ -206,10 +206,6 @@ $(Configuration)\ $(Configuration)\ $(Configuration)\ - $(PlatformName)\$(Configuration)\ - $(PlatformName)\$(Configuration)\ - $(PlatformName)\$(Configuration)\ - $(PlatformName)\$(Configuration)\ $(Platform)\$(Configuration)\ $(Platform)\$(Configuration)\ $(Platform)\$(Configuration)\ @@ -229,10 +225,7 @@ true EnableFastChecks MultiThreadedDebugDLL - - TurnOffAllWarnings - EditAndContinue CompileAsC @@ -248,14 +241,11 @@ ..\..\..\include;..\..;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions) true - - MultiThreadedDLL false TurnOffAllWarnings - ProgramDatabase CompileAsC 4244;4305;4311;4100;4127;%(DisableSpecificWarnings) @@ -395,10 +385,7 @@ true EnableFastChecks MultiThreadedDebugDLL - - TurnOffAllWarnings - ProgramDatabase CompileAsC @@ -417,14 +404,9 @@ ..\..\..\include;..\..;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions) true - - MultiThreadedDLL false - - TurnOffAllWarnings - ProgramDatabase CompileAsC 4244;4305;4311;4100;4127;%(DisableSpecificWarnings) diff --git a/libs/speex/win32/VS2008/libspeexdsp/libspeexdsp.vcxproj b/libs/speex/win32/VS2008/libspeexdsp/libspeexdsp.vcxproj index 5a67b9d495..7338f1960d 100644 --- a/libs/speex/win32/VS2008/libspeexdsp/libspeexdsp.vcxproj +++ b/libs/speex/win32/VS2008/libspeexdsp/libspeexdsp.vcxproj @@ -91,10 +91,12 @@ + + @@ -107,22 +109,16 @@ + + <_ProjectFileVersion>10.0.30319.1 - $(PlatformName)\$(Configuration)\ - $(PlatformName)\$(Configuration)\ - $(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - $(PlatformName)\$(Configuration)\ - $(PlatformName)\$(Configuration)\ - $(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ $(Configuration)\ $(Configuration)\ $(Platform)\$(Configuration)\ @@ -140,10 +136,7 @@ true EnableFastChecks MultiThreadedDebugDLL - - TurnOffAllWarnings - EditAndContinue CompileAsC @@ -159,10 +152,7 @@ true EnableFastChecks MultiThreadedDebugDLL - - TurnOffAllWarnings - ProgramDatabase CompileAsC @@ -176,14 +166,9 @@ ..\..\..\include;..\..;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions) true - - MultiThreadedDLL false - - TurnOffAllWarnings - ProgramDatabase CompileAsC 4244;4305;4311;4100;4127;%(DisableSpecificWarnings) @@ -201,14 +186,9 @@ ..\..\..\include;..\..;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions) true - - MultiThreadedDLL false - - TurnOffAllWarnings - ProgramDatabase CompileAsC 4244;4305;4311;4100;4127;%(DisableSpecificWarnings) diff --git a/libs/srtp/libsrtp.2010.vcxproj b/libs/srtp/libsrtp.2010.vcxproj index 70e6fb6881..f16277300e 100644 --- a/libs/srtp/libsrtp.2010.vcxproj +++ b/libs/srtp/libsrtp.2010.vcxproj @@ -88,9 +88,11 @@ + + @@ -100,21 +102,15 @@ + + <_ProjectFileVersion>10.0.30319.1 - $(Configuration)\ - $(Configuration)\ - $(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - $(Configuration)\ - $(Configuration)\ - $(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ $(SolutionDir)Debug\ $(Configuration)\ $(SolutionDir)$(Platform)\$(Configuration)\ @@ -129,13 +125,6 @@ Creating config.h from config.hw copy /Y "$(ProjectDir)config.hw" "$(ProjectDir)crypto\include\config.h" > NUL - - - - - - %(Outputs) - Disabled crypto/include;include;%(AdditionalIncludeDirectories) @@ -145,11 +134,8 @@ MultiThreadedDebugDLL Default false - - Level4 true - ProgramDatabase @@ -157,13 +143,6 @@ Creating config.h from config.hw copy /Y "$(ProjectDir)config.hw" "$(ProjectDir)crypto\include\config.h" > NUL - - - - - - %(Outputs) - X64 @@ -175,11 +154,8 @@ EnableFastChecks MultiThreadedDebugDLL Default - - Level4 false - ProgramDatabase @@ -187,24 +163,13 @@ Creating config.h from config.hw copy /Y "$(ProjectDir)config.hw" "$(ProjectDir)crypto\include\config.h" > NUL - - - - - - %(Outputs) - crypto/include;include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions) MultiThreadedDLL Default - false - - Level4 true - ProgramDatabase @@ -212,13 +177,6 @@ Creating config.h from config.hw copy /Y "$(ProjectDir)config.hw" "$(ProjectDir)crypto\include\config.h" > NUL - - - - - - %(Outputs) - X64 @@ -227,11 +185,8 @@ WIN32;NDEBUG;_LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions) MultiThreadedDLL Default - - Level4 false - ProgramDatabase diff --git a/libs/win32/Dowload 32khz Sounds.2010.vcxproj b/libs/win32/Dowload 32khz Sounds.2010.vcxproj index ea4360fe6c..e6373ddd39 100644 --- a/libs/win32/Dowload 32khz Sounds.2010.vcxproj +++ b/libs/win32/Dowload 32khz Sounds.2010.vcxproj @@ -37,10 +37,8 @@ <_ProjectFileVersion>10.0.30319.1 - $(Configuration)\ - $(Configuration)\ - $(Configuration)\ - $(Configuration)\ + $(PlatformName)\32khzsounds\$(Configuration)\ + $(PlatformName)\32khzsounds\$(Configuration)\ @@ -71,11 +69,6 @@ $(ProjectDir)..\sounds\en\us\callie\voicemail\32000;%(Outputs) - - - {e10571c4-e7f4-4608-b5f2-b22e7eb95400} - - diff --git a/libs/win32/Dowload 32khz music.2010.vcxproj b/libs/win32/Dowload 32khz music.2010.vcxproj index e39ce87b85..3c2acdfdc8 100644 --- a/libs/win32/Dowload 32khz music.2010.vcxproj +++ b/libs/win32/Dowload 32khz music.2010.vcxproj @@ -37,10 +37,8 @@ <_ProjectFileVersion>10.0.30319.1 - $(Configuration)\ - $(Configuration)\ - $(Configuration)\ - $(Configuration)\ + $(PlatformName)\32khzmusic\$(Configuration)\ + $(PlatformName)\32khzmusic\$(Configuration)\ @@ -77,11 +75,6 @@ if not exist "$(ProjectDir)..\sounds\music\32000" cscript /nologo "$(ProjectDir) $(ProjectDir)..\sounds\music\32000;%(Outputs) - - - {6e49f6c2-adda-4bfb-81fe-ab9af51b455f} - - diff --git a/libs/win32/Download 16khz Sounds.2010.vcxproj b/libs/win32/Download 16khz Sounds.2010.vcxproj index e13ab61e3d..024cac5723 100644 --- a/libs/win32/Download 16khz Sounds.2010.vcxproj +++ b/libs/win32/Download 16khz Sounds.2010.vcxproj @@ -37,10 +37,8 @@ <_ProjectFileVersion>10.0.30319.1 - $(Configuration)\ - $(Configuration)\ - $(Configuration)\ - $(Configuration)\ + $(PlatformName)\16khzsounds\$(Configuration)\ + $(PlatformName)\16khzsounds\$(Configuration)\ @@ -71,11 +69,6 @@ $(ProjectDir)..\sounds\en\us\callie\voicemail\16000;%(Outputs) - - - {4f5c9d55-98ef-4256-8311-32d7bd360406} - - diff --git a/libs/win32/Download 16khz music.2010.vcxproj b/libs/win32/Download 16khz music.2010.vcxproj index e7adf75bf9..f73e3bc837 100644 --- a/libs/win32/Download 16khz music.2010.vcxproj +++ b/libs/win32/Download 16khz music.2010.vcxproj @@ -37,10 +37,8 @@ <_ProjectFileVersion>10.0.30319.1 - $(Configuration)\ - $(Configuration)\ - $(Configuration)\ - $(Configuration)\ + $(PlatformName)\16khzmusic\$(Configuration)\ + $(PlatformName)\16khzmusic\$(Configuration)\ @@ -77,11 +75,6 @@ if not exist "$(ProjectDir)..\sounds\music\16000" cscript /nologo "$(ProjectDir) $(ProjectDir)..\sounds\music\16000;%(Outputs) - - - {87a1fe3d-f410-4c8e-9591-8c625985bc70} - - diff --git a/libs/win32/Download 8khz Sounds.2010.vcxproj b/libs/win32/Download 8khz Sounds.2010.vcxproj index 29a356e03b..a45c2b0094 100644 --- a/libs/win32/Download 8khz Sounds.2010.vcxproj +++ b/libs/win32/Download 8khz Sounds.2010.vcxproj @@ -37,10 +37,8 @@ <_ProjectFileVersion>10.0.30319.1 - $(Configuration)\ - $(Configuration)\ - $(Configuration)\ - $(Configuration)\ + $(PlatformName)\8khzsounds\$(Configuration)\ + $(PlatformName)\8khzsounds\$(Configuration)\ diff --git a/libs/win32/Download 8khz music.2010.vcxproj b/libs/win32/Download 8khz music.2010.vcxproj index a0fc7302d8..b8c62c7542 100644 --- a/libs/win32/Download 8khz music.2010.vcxproj +++ b/libs/win32/Download 8khz music.2010.vcxproj @@ -37,10 +37,8 @@ <_ProjectFileVersion>10.0.30319.1 - $(Configuration)\ - $(Configuration)\ - $(Configuration)\ - $(Configuration)\ + $(PlatformName)\8khzmusic\$(Configuration)\ + $(PlatformName)\8khzmusic\$(Configuration)\ @@ -75,11 +73,6 @@ if not exist "$(ProjectDir)..\sounds\music\8000" cscript /nologo "$(ProjectDir)u $(ProjectDir)..\sounds\music\8000;%(Outputs) - - - {3ce1dc99-8246-4db1-a709-74f19f08ec67} - - diff --git a/libs/win32/Download CELT.vcxproj b/libs/win32/Download CELT.vcxproj index fb05383ebc..4b4fd0d83e 100644 --- a/libs/win32/Download CELT.vcxproj +++ b/libs/win32/Download CELT.vcxproj @@ -36,10 +36,8 @@ <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)$(Configuration)\ - $(Configuration)\ - $(SolutionDir)$(Configuration)\ - $(Configuration)\ + $(PlatformName)\CELT\$(Configuration)\ + $(PlatformName)\CELT\$(Configuration)\ @@ -80,11 +78,6 @@ xcopy "$(ProjectDir)\celt\float_cast.h" "$(ProjectDir)..\celt-0.7.1\libcelt" /C $(ProjectDir)..\CELT;%(Outputs) - - - {1f0a8a77-e661-418f-bb92-82172ae43803} - - diff --git a/libs/win32/Download FLITE.2010.vcxproj b/libs/win32/Download FLITE.2010.vcxproj index ef6791e48a..a3da32870a 100644 --- a/libs/win32/Download FLITE.2010.vcxproj +++ b/libs/win32/Download FLITE.2010.vcxproj @@ -37,10 +37,8 @@ <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)$(Configuration)\ - $(Configuration)\ - $(SolutionDir)$(Configuration)\ - $(Configuration)\ + $(PlatformName)\FLITE\$(Configuration)\ + $(PlatformName)\FLITE\$(Configuration)\ @@ -77,11 +75,6 @@ $(ProjectDir)..\flite-1.3.99;%(Outputs) - - - {fff82f9b-6a2b-4be3-95d8-dc5a4fc71e19} - - diff --git a/libs/win32/Download JSON.2010.vcxproj b/libs/win32/Download JSON.2010.vcxproj index f9faff4d27..ae7d6ca7cd 100644 --- a/libs/win32/Download JSON.2010.vcxproj +++ b/libs/win32/Download JSON.2010.vcxproj @@ -37,10 +37,8 @@ <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)$(Configuration)\ - $(Configuration)\ - $(SolutionDir)$(Configuration)\ - $(Configuration)\ + $(PlatformName)\JSON\$(Configuration)\ + $(PlatformName)\JSON\$(Configuration)\ @@ -75,11 +73,6 @@ $(ProjectDir)..\JSON;%(Outputs) - - - {d5d2bf72-29fe-4982-a9fa-82fdd086db1b} - - diff --git a/libs/win32/Download LAME.2010.vcxproj b/libs/win32/Download LAME.2010.vcxproj index 66cba3698e..74dba6e3a1 100644 --- a/libs/win32/Download LAME.2010.vcxproj +++ b/libs/win32/Download LAME.2010.vcxproj @@ -37,10 +37,8 @@ <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)$(Configuration)\ - $(Configuration)\ - $(SolutionDir)$(Configuration)\ - $(Configuration)\ + $(PlatformName)\LAME\$(Configuration)\ + $(PlatformName)\LAME\$(Configuration)\ @@ -77,11 +75,6 @@ $(ProjectDir)..\lame-3.97;%(Outputs) - - - {b808178b-82f0-4cf4-a2b1-921939fa24d0} - - diff --git a/libs/win32/Download LIBSHOUT.2010.vcxproj b/libs/win32/Download LIBSHOUT.2010.vcxproj index 685d733335..dede9fa43c 100644 --- a/libs/win32/Download LIBSHOUT.2010.vcxproj +++ b/libs/win32/Download LIBSHOUT.2010.vcxproj @@ -37,10 +37,8 @@ <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)$(Configuration)\ - $(Configuration)\ - $(SolutionDir)$(Configuration)\ - $(Configuration)\ + $(PlatformName)\LIBSHOUT\$(Configuration)\ + $(PlatformName)\LIBSHOUT\$(Configuration)\ @@ -77,11 +75,6 @@ $(ProjectDir)..\libshout-2.2.2;%(Outputs) - - - {d5d2bf72-29fe-4982-a9fa-82ab2086db1b} - - diff --git a/libs/win32/Download OGG.2010.vcxproj b/libs/win32/Download OGG.2010.vcxproj index b8daf3a83e..8f9097ac6c 100644 --- a/libs/win32/Download OGG.2010.vcxproj +++ b/libs/win32/Download OGG.2010.vcxproj @@ -37,10 +37,8 @@ <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)$(Configuration)\ - $(Configuration)\ - $(SolutionDir)$(Configuration)\ - $(Configuration)\ + $(PlatformName)\OGG\$(Configuration)\ + $(PlatformName)\OGG\$(Configuration)\ @@ -77,11 +75,6 @@ $(ProjectDir)..\libogg-1.1.3;%(Outputs) - - - {e796e337-de78-4303-8614-9a590862ee95} - - diff --git a/libs/win32/Download PTHREAD.2010.vcxproj b/libs/win32/Download PTHREAD.2010.vcxproj index cbf639d07c..c44d4a4024 100644 --- a/libs/win32/Download PTHREAD.2010.vcxproj +++ b/libs/win32/Download PTHREAD.2010.vcxproj @@ -37,10 +37,8 @@ <_ProjectFileVersion>10.0.30319.1 - $(Configuration)\ - $(Configuration)\ - $(Configuration)\ - $(Configuration)\ + $(PlatformName)\PTHREAD\$(Configuration)\ + $(PlatformName)\PTHREAD\$(Configuration)\ @@ -73,11 +71,6 @@ $(ProjectDir)..\pthreads-w32-2-7-0-release;%(Outputs) - - - {af8163ee-fa76-4904-a11d-7d70a1b5ba2e} - - diff --git a/libs/win32/Download mpg123.2010.vcxproj b/libs/win32/Download mpg123.2010.vcxproj index eb9d52cf7c..54e04aecc0 100644 --- a/libs/win32/Download mpg123.2010.vcxproj +++ b/libs/win32/Download mpg123.2010.vcxproj @@ -37,10 +37,8 @@ <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)$(Configuration)\ - $(Configuration)\ - $(SolutionDir)$(Configuration)\ - $(Configuration)\ + $(PlatformName)\mpg123\$(Configuration)\ + $(PlatformName)\mpg123\$(Configuration)\ @@ -77,11 +75,6 @@ $(ProjectDir)..\mpg123;%(Outputs) - - - {d5d2bf72-29fe-4982-a9fa-82ab3086db1b} - - diff --git a/libs/win32/Download pocketsphinx.2010.vcxproj b/libs/win32/Download pocketsphinx.2010.vcxproj index 00230d9a2e..9d9f4e1a06 100644 --- a/libs/win32/Download pocketsphinx.2010.vcxproj +++ b/libs/win32/Download pocketsphinx.2010.vcxproj @@ -37,10 +37,8 @@ <_ProjectFileVersion>10.0.30319.1 - $(Configuration)\ - $(Configuration)\ - $(Configuration)\ - $(Configuration)\ + $(PlatformName)\pocketsphinx\$(Configuration)\ + $(PlatformName)\pocketsphinx\$(Configuration)\ @@ -73,11 +71,6 @@ $(ProjectDir)..\pocketsphinx-0.5.99;%(Outputs) - - - {d5d2bf72-29fe-4982-a9fa-82ab1086db1b} - - diff --git a/libs/win32/Download sphinxbase.2010.vcxproj b/libs/win32/Download sphinxbase.2010.vcxproj index 1634042b99..72a5df9ccb 100644 --- a/libs/win32/Download sphinxbase.2010.vcxproj +++ b/libs/win32/Download sphinxbase.2010.vcxproj @@ -37,10 +37,8 @@ <_ProjectFileVersion>10.0.30319.1 - $(Configuration)\ - $(Configuration)\ - $(Configuration)\ - $(Configuration)\ + $(PlatformName)\sphinxbase\$(Configuration)\ + $(PlatformName)\sphinxbase\$(Configuration)\ @@ -73,11 +71,6 @@ $(ProjectDir)..\sphinxbase-0.4.99;%(Outputs) - - - {8b3b4c4c-13c2-446c-beb0-f412cc2cfb9a} - - diff --git a/libs/win32/Download sphinxmodel.2010.vcxproj b/libs/win32/Download sphinxmodel.2010.vcxproj index 6a2e4318d9..182c7ccd48 100644 --- a/libs/win32/Download sphinxmodel.2010.vcxproj +++ b/libs/win32/Download sphinxmodel.2010.vcxproj @@ -37,10 +37,8 @@ <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)$(Configuration)\ - $(Configuration)\ - $(SolutionDir)$(Configuration)\ - $(Configuration)\ + $(PlatformName)\sphinxmodel\$(Configuration)\ + $(PlatformName)\sphinxmodel\$(Configuration)\ @@ -76,11 +74,6 @@ $(ProjectDir)..\Communicator_semi_40.cd_semi_6000;%(Outputs) - - - {4f92b672-dadb-4047-8d6a-4bb3796733fd} - - diff --git a/libs/win32/apr-util/libaprutil.2010.vcxproj b/libs/win32/apr-util/libaprutil.2010.vcxproj index 15b99812f0..a39f21e091 100644 --- a/libs/win32/apr-util/libaprutil.2010.vcxproj +++ b/libs/win32/apr-util/libaprutil.2010.vcxproj @@ -45,30 +45,26 @@ + + + + <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)$(PlatformName)\$(Configuration)\ - $(Configuration)\ false - $(SolutionDir)$(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ false - $(SolutionDir)$(PlatformName)\$(Configuration)\ - $(Configuration)\ false - $(SolutionDir)$(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ false @@ -94,12 +90,8 @@ if not exist "$(ProjectDir)..\..\apr-util\include\apu_want.h" type "$(ProjectDir ..\..\apr-util\include;..\..\apr-util\include/private;..\..\apr-util\dbm/sdbm;..\..\apr-iconv-1.1.1\include;..\..\apr\include;%(AdditionalIncludeDirectories) _DEBUG;APU_DECLARE_EXPORT;APU_USE_SDBM;WIN32;_WINDOWS;%(PreprocessorDefinitions) MultiThreadedDebugDLL - $(IntDir)libaprutil.pch - $(IntDir) - .\Debug/ Level3 true - ProgramDatabase _DEBUG;APU_VERSION_ONLY;%(PreprocessorDefinitions) @@ -115,9 +107,6 @@ if not exist "$(ProjectDir)..\..\apr-util\include\apu_want.h" type "$(ProjectDir Windows 0x6EE60000 false - - - $(IntDir)libaprutil-1.lib MachineX86 @@ -153,10 +142,8 @@ if not exist "$(ProjectDir)..\..\apr-util\include\apu_want.h" type "$(ProjectDir ..\..\apr-util\include;..\..\apr-util\include/private;..\..\apr-util\dbm/sdbm;..\..\apr-iconv-1.1.1\include;..\..\apr\include;%(AdditionalIncludeDirectories) _DEBUG;APU_DECLARE_EXPORT;APU_USE_SDBM;WIN32;_WINDOWS;%(PreprocessorDefinitions) MultiThreadedDebugDLL - $(IntDir)libaprutil.pch Level3 true - ProgramDatabase _DEBUG;APU_VERSION_ONLY;%(PreprocessorDefinitions) @@ -172,9 +159,6 @@ if not exist "$(ProjectDir)..\..\apr-util\include\apu_want.h" type "$(ProjectDir Windows 0x6EE60000 false - - - $(TargetDir)libaprutil-1.lib MachineX64 @@ -212,12 +196,8 @@ if not exist "$(ProjectDir)..\..\apr-util\include\apu_want.h" type "$(ProjectDir true MultiThreadedDLL true - $(IntDir)libaprutil.pch - $(IntDir) - .\Release/ Level3 true - ProgramDatabase NDEBUG;APU_VERSION_ONLY;%(PreprocessorDefinitions) @@ -234,8 +214,6 @@ if not exist "$(ProjectDir)..\..\apr-util\include\apu_want.h" type "$(ProjectDir true 0x6EE60000 false - - $(IntDir)libaprutil-1.lib MachineX86 @@ -274,10 +252,8 @@ if not exist "$(ProjectDir)..\..\apr-util\include\apu_want.h" type "$(ProjectDir true MultiThreadedDLL true - $(IntDir)libaprutil.pch Level3 true - ProgramDatabase NDEBUG;APU_VERSION_ONLY;%(PreprocessorDefinitions) @@ -294,9 +270,6 @@ if not exist "$(ProjectDir)..\..\apr-util\include\apu_want.h" type "$(ProjectDir true 0x6EE60000 false - - - $(TargetDir)libaprutil-1.lib MachineX64 diff --git a/libs/win32/apr-util/xml.2010.vcxproj b/libs/win32/apr-util/xml.2010.vcxproj index 6106a58832..2b7245411a 100644 --- a/libs/win32/apr-util/xml.2010.vcxproj +++ b/libs/win32/apr-util/xml.2010.vcxproj @@ -51,27 +51,27 @@ + + + + <_ProjectFileVersion>10.0.30319.1 - $(PlatformName)\$(Configuration)\ - $(PlatformName)\$(Configuration)\ - $(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - $(PlatformName)\$(Configuration)\ - $(PlatformName)\$(Configuration)\ - $(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ + $(PlatformName)\xml\$(Configuration)\ + $(PlatformName)\xml\$(Configuration)\ + $(PlatformName)\xml\$(Configuration)\ + $(PlatformName)\xml\$(Configuration)\ @@ -82,24 +82,17 @@ true MultiThreadedDLL true - $(IntDir)xml.pch - $(IntDir) - $(IntDir) - $(IntDir)xml_src Level3 true - ProgramDatabase 0x0409 - $(OutDir)$(ProjectName).lib true true - $(IntDir)xml.bsc @@ -114,24 +107,17 @@ true MultiThreadedDLL true - $(IntDir)xml.pch - $(IntDir) - $(IntDir) - $(IntDir)vc90.pdb Level3 true - ProgramDatabase 0x0409 - $(OutDir)$(ProjectName).lib true true - $(IntDir)xml.bsc @@ -141,24 +127,17 @@ $(ProjectDir)..\..\apr-util\xml\expat\lib\;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;VERSION="expat_1.95.2";%(PreprocessorDefinitions) MultiThreadedDebugDLL - $(IntDir)xml.pch - $(IntDir) - $(IntDir) - LibD\xml_src Level3 true - ProgramDatabase 0x0409 - $(OutDir)$(ProjectName).lib true true - $(IntDir)xml.bsc @@ -171,24 +150,17 @@ $(ProjectDir)..\..\apr-util\xml\expat\lib\;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;VERSION="expat_1.95.2";%(PreprocessorDefinitions) MultiThreadedDebugDLL - $(IntDir)xml.pch - $(IntDir) - $(IntDir) - LibD\xml_src Level3 true - ProgramDatabase 0x0409 - $(OutDir)$(ProjectName).lib true true - $(IntDir)xml.bsc diff --git a/libs/win32/apr/libapr.2010.vcxproj b/libs/win32/apr/libapr.2010.vcxproj index 3df243d1aa..6638ec7d43 100644 --- a/libs/win32/apr/libapr.2010.vcxproj +++ b/libs/win32/apr/libapr.2010.vcxproj @@ -45,30 +45,26 @@ + + + + <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)$(PlatformName)\$(Configuration)\ - $(Configuration)\ false - $(SolutionDir)\$(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ false - $(SolutionDir)$(PlatformName)\$(Configuration)\ - $(Configuration)\ false - $(SolutionDir)$(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ false @@ -82,12 +78,8 @@ ..\..\apr\include;..\..\apr\include/arch;..\..\apr\include/arch/win32;..\..\apr\include/arch/unix;%(AdditionalIncludeDirectories) _DEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;%(PreprocessorDefinitions) MultiThreadedDebugDLL - $(IntDir)libapr.pch - $(IntDir) - .\Debug/ Level3 true - ProgramDatabase _DEBUG;APR_VERSION_ONLY;%(PreprocessorDefinitions) @@ -126,10 +118,8 @@ ..\..\apr\include;..\..\apr\include/arch;..\..\apr\include/arch/win32;..\..\apr\include/arch/unix;%(AdditionalIncludeDirectories) _DEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;%(PreprocessorDefinitions) MultiThreadedDebugDLL - $(IntDir)libapr.pch Level3 true - ProgramDatabase _DEBUG;APR_VERSION_ONLY;%(PreprocessorDefinitions) @@ -144,8 +134,6 @@ Windows 0x6EEC0000 false - - MachineX64 @@ -170,12 +158,8 @@ true MultiThreadedDLL true - $(IntDir)libapr.pch - $(IntDir) - .\Release/ Level3 true - ProgramDatabase NDEBUG;APR_VERSION_ONLY;%(PreprocessorDefinitions) @@ -191,8 +175,6 @@ true 0x6EEC0000 false - - MachineX86 @@ -217,10 +199,8 @@ true MultiThreadedDLL true - $(IntDir)libapr.pch Level3 true - ProgramDatabase NDEBUG;APR_VERSION_ONLY;%(PreprocessorDefinitions) @@ -236,8 +216,6 @@ true 0x6EEC0000 false - - MachineX64 diff --git a/libs/win32/celt/libcelt.vcxproj b/libs/win32/celt/libcelt.vcxproj index 55c59dfef9..6abd09915b 100644 --- a/libs/win32/celt/libcelt.vcxproj +++ b/libs/win32/celt/libcelt.vcxproj @@ -47,27 +47,23 @@ + + + + <_ProjectFileVersion>10.0.30319.1 - $(PlatformName)\$(Configuration)\ - $(PlatformName)\$(Configuration)\ - $(PlatformName)\$(Configuration)\ - $(PlatformName)\$(Configuration)\ - $(PlatformName)\$(Configuration)\ - $(PlatformName)\$(Configuration)\ - $(PlatformName)\$(Configuration)\ - $(PlatformName)\$(Configuration)\ @@ -77,10 +73,7 @@ true EnableFastChecks MultiThreadedDebugDLL - - Level3 - EditAndContinue @@ -94,10 +87,7 @@ true EnableFastChecks MultiThreadedDebugDLL - - Level3 - ProgramDatabase @@ -108,10 +98,7 @@ WIN32;NDEBUG;_LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions) MultiThreadedDLL true - - Level3 - ProgramDatabase @@ -125,10 +112,7 @@ WIN32;NDEBUG;_LIB;HAVE_CONFIG_H;_AMD64_;_WIN64;%(PreprocessorDefinitions) MultiThreadedDLL true - - Level3 - ProgramDatabase diff --git a/libs/win32/curl/curllib.2010.vcxproj b/libs/win32/curl/curllib.2010.vcxproj index b76dd1c365..979093e958 100644 --- a/libs/win32/curl/curllib.2010.vcxproj +++ b/libs/win32/curl/curllib.2010.vcxproj @@ -49,27 +49,23 @@ + + + + <_ProjectFileVersion>10.0.30319.1 - .\Release\ - .\Release\ - $(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - .\Debug\ - .\Debug\ - $(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ @@ -89,14 +85,9 @@ true MultiThreadedDLL true - $(IntDir)curllib.pch - $(IntDir) - .\Release/ - $(IntDir) true TurnOffAllWarnings true - ProgramDatabase NDEBUG;%(PreprocessorDefinitions) @@ -125,11 +116,9 @@ true MultiThreadedDLL true - $(IntDir)curllib.pch true TurnOffAllWarnings true - ProgramDatabase NDEBUG;%(PreprocessorDefinitions) @@ -157,14 +146,9 @@ true EnableFastChecks MultiThreadedDebugDLL - $(IntDir)curllib.pch - $(IntDir) - .\Debug/ - $(IntDir) true TurnOffAllWarnings true - ProgramDatabase _DEBUG;%(PreprocessorDefinitions) @@ -192,11 +176,9 @@ true EnableFastChecks MultiThreadedDebugDLL - $(IntDir)curllib.pch true TurnOffAllWarnings true - ProgramDatabase _DEBUG;%(PreprocessorDefinitions) diff --git a/libs/win32/flite/flite.2010.vcxproj b/libs/win32/flite/flite.2010.vcxproj index a8cce33108..f6b0be5e27 100644 --- a/libs/win32/flite/flite.2010.vcxproj +++ b/libs/win32/flite/flite.2010.vcxproj @@ -47,27 +47,23 @@ + + + + <_ProjectFileVersion>10.0.30319.1 - $(PlatformName)\$(Configuration)\ - $(PlatformName)\$(Configuration)\ - $(PlatformName)\$(Configuration)\ - $(PlatformName)\$(Configuration)\ - $(PlatformName)\$(Configuration)\ - $(PlatformName)\$(Configuration)\ - $(PlatformName)\$(Configuration)\ - $(PlatformName)\$(Configuration)\ @@ -78,7 +74,6 @@ EnableFastChecks MultiThreadedDebugDLL Level4 - EditAndContinue 4100;4057;4706;%(DisableSpecificWarnings) @@ -94,7 +89,6 @@ EnableFastChecks MultiThreadedDebugDLL TurnOffAllWarnings - ProgramDatabase 4100;4057;4706;%(DisableSpecificWarnings) @@ -108,7 +102,6 @@ MultiThreadedDLL true TurnOffAllWarnings - ProgramDatabase 4100;4057;4706;%(DisableSpecificWarnings) @@ -125,7 +118,6 @@ MultiThreadedDLL true TurnOffAllWarnings - ProgramDatabase 4100;4057;4706;%(DisableSpecificWarnings) diff --git a/libs/win32/iksemel/iksemel.2010.vcxproj b/libs/win32/iksemel/iksemel.2010.vcxproj index f62a5bf94a..d3c870eb13 100644 --- a/libs/win32/iksemel/iksemel.2010.vcxproj +++ b/libs/win32/iksemel/iksemel.2010.vcxproj @@ -48,27 +48,23 @@ + + + + <_ProjectFileVersion>10.0.30319.1 - $(Configuration)\ - $(Configuration)\ - $(Configuration)\ - $(Configuration)\ - $(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ @@ -78,10 +74,7 @@ true EnableFastChecks MultiThreadedDebugDLL - - TurnOffAllWarnings - ProgramDatabase @@ -89,10 +82,7 @@ ..\..\iksemel\include;.;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_LIB;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions) MultiThreadedDLL - - TurnOffAllWarnings - ProgramDatabase @@ -106,10 +96,7 @@ true EnableFastChecks MultiThreadedDebugDLL - - TurnOffAllWarnings - ProgramDatabase @@ -120,10 +107,7 @@ ..\..\iksemel\include;.;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_LIB;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions) MultiThreadedDLL - - TurnOffAllWarnings - ProgramDatabase diff --git a/libs/win32/js/js.2010.vcxproj b/libs/win32/js/js.2010.vcxproj index f43da6e0b4..81131a97b0 100644 --- a/libs/win32/js/js.2010.vcxproj +++ b/libs/win32/js/js.2010.vcxproj @@ -45,30 +45,26 @@ + + + + <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)$(PlatformName)\$(Configuration)\ - $(PlatformName)\$(Configuration)\ false - $(SolutionDir)$(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ false - $(SolutionDir)$(PlatformName)\$(Configuration)\ - $(PlatformName)\$(Configuration)\ false - $(SolutionDir)$(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ false @@ -84,8 +80,6 @@ if not exist "$(ProjectDir)..\..\js\nsprpub\pr\include\prcpucfg.h" type "$(Proje true Win32 $(IntDir)js.tlb - - MaxSpeed @@ -95,11 +89,6 @@ if not exist "$(ProjectDir)..\..\js\nsprpub\pr\include\prcpucfg.h" type "$(Proje true MultiThreadedDLL true - $(IntDir)js.pch - - - $(IntDir) - $(IntDir)vc80.pdb TurnOffAllWarnings true @@ -115,9 +104,6 @@ if not exist "$(ProjectDir)..\..\js\nsprpub\pr\include\prcpucfg.h" type "$(Proje false false false - - - $(IntDir)js32.lib MachineX86 @@ -142,8 +128,6 @@ if not exist "$(ProjectDir)..\..\js\nsprpub\pr\include\prcpucfg.h" type "$(Proje true X64 $(IntDir)js.tlb - - MaxSpeed @@ -153,11 +137,6 @@ if not exist "$(ProjectDir)..\..\js\nsprpub\pr\include\prcpucfg.h" type "$(Proje true MultiThreadedDLL true - $(IntDir)js.pch - - - $(IntDir) - $(IntDir)vc80.pdb TurnOffAllWarnings true @@ -173,9 +152,6 @@ if not exist "$(ProjectDir)..\..\js\nsprpub\pr\include\prcpucfg.h" type "$(Proje false false false - - - $(TargetDir)js32.lib MachineX64 @@ -200,8 +176,6 @@ if not exist "$(ProjectDir)..\..\js\nsprpub\pr\include\prcpucfg.h" type "$(Proje true Win32 $(IntDir)js.tlb - - Disabled @@ -209,14 +183,8 @@ if not exist "$(ProjectDir)..\..\js\nsprpub\pr\include\prcpucfg.h" type "$(Proje _DEBUG;DEBUG;_X86_=1;_WINDOWS;WIN32;XP_WIN;JSFILE;EXPORT_JS_API;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;JS_THREADSAFE;OSSP;_NSPR_BUILD_;JS_HAS_FILE_OBJECT=1;%(PreprocessorDefinitions) true MultiThreadedDebugDLL - $(IntDir)js.pch - - - $(IntDir) - $(IntDir)vc80.pdb TurnOffAllWarnings true - ProgramDatabase _DEBUG;%(PreprocessorDefinitions) @@ -228,9 +196,6 @@ if not exist "$(ProjectDir)..\..\js\nsprpub\pr\include\prcpucfg.h" type "$(Proje %(AdditionalLibraryDirectories) Windows false - - - $(IntDir)js32.lib MachineX86 true @@ -256,8 +221,6 @@ if not exist "$(ProjectDir)..\..\js\nsprpub\pr\include\prcpucfg.h" type "$(Proje true X64 $(IntDir)js.tlb - - Disabled @@ -265,14 +228,8 @@ if not exist "$(ProjectDir)..\..\js\nsprpub\pr\include\prcpucfg.h" type "$(Proje _DEBUG;DEBUG;_AMD64_=1;_WINDOWS;WIN32;XP_WIN;JSFILE;EXPORT_JS_API;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;JS_THREADSAFE;OSSP;_NSPR_BUILD_;JS_HAS_FILE_OBJECT=1;%(PreprocessorDefinitions) true MultiThreadedDebugDLL - $(IntDir)js.pch - - - $(IntDir) - $(IntDir)vc80.pdb TurnOffAllWarnings true - ProgramDatabase _DEBUG;%(PreprocessorDefinitions) @@ -285,9 +242,6 @@ if not exist "$(ProjectDir)..\..\js\nsprpub\pr\include\prcpucfg.h" type "$(Proje true Windows false - - - $(TargetDir)js32.lib MachineX64 diff --git a/libs/win32/json/libjson.2010.vcxproj b/libs/win32/json/libjson.2010.vcxproj index abd90a20b8..5846ff3e92 100644 --- a/libs/win32/json/libjson.2010.vcxproj +++ b/libs/win32/json/libjson.2010.vcxproj @@ -48,27 +48,23 @@ + + + + <_ProjectFileVersion>10.0.30319.1 - $(PlatformName)\$(Configuration)\ - $(PlatformName)\$(Configuration)\ - $(PlatformName)\$(Configuration)\ - $(PlatformName)\$(Configuration)\ - $(PlatformName)\$(Configuration)\ - $(PlatformName)\$(Configuration)\ - $(PlatformName)\$(Configuration)\ - $(PlatformName)\$(Configuration)\ @@ -78,10 +74,7 @@ true EnableFastChecks MultiThreadedDebugDLL - - Level3 - EditAndContinue @@ -95,10 +88,7 @@ true EnableFastChecks MultiThreadedDebugDLL - - Level3 - ProgramDatabase @@ -109,10 +99,7 @@ WIN32;_DEBUG;_LIB;HAVE_CONFIG_H;HAVE_STDARG_H;STDC_HEADERS;%(PreprocessorDefinitions) MultiThreadedDLL true - - Level3 - ProgramDatabase @@ -126,10 +113,7 @@ WIN32;_DEBUG;_LIB;HAVE_CONFIG_H;HAVE_STDARG_H;STDC_HEADERS;%(PreprocessorDefinitions) MultiThreadedDLL true - - Level3 - ProgramDatabase diff --git a/libs/win32/libg722_1/libg722_1.vcxproj b/libs/win32/libg722_1/libg722_1.vcxproj index 5e41d3fbbf..5dd165ad03 100644 --- a/libs/win32/libg722_1/libg722_1.vcxproj +++ b/libs/win32/libg722_1/libg722_1.vcxproj @@ -47,27 +47,23 @@ + + + + <_ProjectFileVersion>10.0.30319.1 - $(Configuration)\ - $(Configuration)\ - $(Configuration)\ - $(Configuration)\ - $(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ @@ -77,12 +73,7 @@ true EnableFastChecks MultiThreadedDebugDLL - - - - Level3 - ProgramDatabase @@ -93,10 +84,7 @@ WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBG722_1_EXPORTS;%(PreprocessorDefinitions) MultiThreadedDLL true - - Level3 - ProgramDatabase @@ -110,12 +98,7 @@ true EnableFastChecks MultiThreadedDebugDLL - - - - Level3 - ProgramDatabase @@ -129,10 +112,7 @@ WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBG722_1_EXPORTS;%(PreprocessorDefinitions) MultiThreadedDLL true - - Level3 - ProgramDatabase diff --git a/libs/win32/libmp3lame/libmp3lame.2010.vcxproj b/libs/win32/libmp3lame/libmp3lame.2010.vcxproj index 2c498fbdbe..8cb8f570ea 100644 --- a/libs/win32/libmp3lame/libmp3lame.2010.vcxproj +++ b/libs/win32/libmp3lame/libmp3lame.2010.vcxproj @@ -45,27 +45,23 @@ + + + + <_ProjectFileVersion>10.0.30319.1 - .\Release\ - .\Release\ - $(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - .\Debug\ - .\Debug\ - $(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ @@ -76,13 +72,8 @@ true MultiThreaded true - $(IntDir)libmp3lame_vc6.pch - $(IntDir) - .\Release/ - $(IntDir) TurnOffAllWarnings true - Default 0x0409 @@ -104,10 +95,8 @@ true MultiThreaded true - $(IntDir)libmp3lame_vc6.pch TurnOffAllWarnings true - Default 0x0409 @@ -123,14 +112,8 @@ .;..\..\lame-3.97;..\..\lame-3.97\include;%(AdditionalIncludeDirectories) _DEBUG;_WINDOWS;WIN32;HAVE_CONFIG_H;%(PreprocessorDefinitions) MultiThreadedDebug - $(IntDir)libmp3lame_vc6.pch - $(IntDir) - .\Debug/ - $(IntDir) TurnOffAllWarnings true - ProgramDatabase - Default 0x0409 @@ -149,11 +132,8 @@ .;..\..\lame-3.97;..\..\lame-3.97\include;%(AdditionalIncludeDirectories) _DEBUG;_WINDOWS;WIN32;HAVE_CONFIG_H;%(PreprocessorDefinitions) MultiThreadedDebug - $(IntDir)libmp3lame_vc6.pch TurnOffAllWarnings true - ProgramDatabase - Default 0x0409 diff --git a/libs/win32/libogg/libogg.2010.vcxproj b/libs/win32/libogg/libogg.2010.vcxproj index 8da4327882..98a24a672e 100644 --- a/libs/win32/libogg/libogg.2010.vcxproj +++ b/libs/win32/libogg/libogg.2010.vcxproj @@ -45,27 +45,23 @@ + + + + <_ProjectFileVersion>10.0.30319.1 - $(Configuration)\ - $(Configuration)\ - $(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - $(Configuration)\ - $(Configuration)\ - $(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ @@ -76,10 +72,6 @@ true MultiThreaded true - .\Static_Release/ogg_static.pch - .\Static_Release/ - .\Static_Release/ - .\Static_Release/ TurnOffAllWarnings true @@ -108,7 +100,6 @@ true MultiThreaded true - .\Static_Release/ogg_static.pch TurnOffAllWarnings true @@ -133,13 +124,8 @@ true EnableFastChecks MultiThreadedDebug - .\Static_Debug/ogg_static.pch - .\Static_Debug/ - .\Static_Debug/ - .\Static_Debug/ TurnOffAllWarnings true - ProgramDatabase _DEBUG;%(PreprocessorDefinitions) @@ -165,10 +151,8 @@ true EnableFastChecks MultiThreadedDebug - .\Static_Debug/ogg_static.pch TurnOffAllWarnings true - ProgramDatabase _DEBUG;%(PreprocessorDefinitions) diff --git a/libs/win32/libshout/libshout.vcxproj b/libs/win32/libshout/libshout.vcxproj index cb9baec093..770d9b7dfe 100644 --- a/libs/win32/libshout/libshout.vcxproj +++ b/libs/win32/libshout/libshout.vcxproj @@ -44,27 +44,23 @@ + + + + <_ProjectFileVersion>10.0.30319.1 - $(Configuration)\ - $(Configuration)\ - $(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - $(Configuration)\ - $(Configuration)\ - $(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ @@ -75,9 +71,6 @@ true MultiThreaded true - .\Static_Release/ - .\Static_Release/ - .\Static_Release/ TurnOffAllWarnings true @@ -86,7 +79,6 @@ 0x0409 - $(OutDir)libshout.lib true @@ -110,7 +102,6 @@ 0x0409 - $(OutDir)libshout.lib true @@ -122,19 +113,14 @@ true EnableFastChecks MultiThreadedDebug - .\Static_Debug/ - .\Static_Debug/ - .\Static_Debug/ TurnOffAllWarnings true - ProgramDatabase _DEBUG;%(PreprocessorDefinitions) 0x0409 - $(OutDir)libshout.lib true @@ -151,14 +137,12 @@ MultiThreadedDebug TurnOffAllWarnings true - ProgramDatabase _DEBUG;%(PreprocessorDefinitions) 0x0409 - $(OutDir)libshout.lib true diff --git a/libs/win32/libsndfile/libsndfile.2010.vcxproj b/libs/win32/libsndfile/libsndfile.2010.vcxproj index 903a05ca72..ea9e3be89a 100644 --- a/libs/win32/libsndfile/libsndfile.2010.vcxproj +++ b/libs/win32/libsndfile/libsndfile.2010.vcxproj @@ -48,27 +48,23 @@ + + + + <_ProjectFileVersion>10.0.30319.1 - $(Configuration)\ - $(Configuration)\ - $(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - $(Configuration)\ - $(Configuration)\ - $(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ @@ -78,10 +74,7 @@ true EnableFastChecks MultiThreadedDebugDLL - - Level1 - ProgramDatabase CompileAsC @@ -96,10 +89,7 @@ true EnableFastChecks MultiThreadedDebugDLL - - Level1 - ProgramDatabase CompileAsC @@ -108,10 +98,7 @@ ..\..\libsndfile\src;.;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_LIB;inline=__inline;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions) MultiThreadedDLL - - Level1 - ProgramDatabase CompileAsC @@ -123,10 +110,7 @@ ..\..\libsndfile\src;.;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_LIB;inline=__inline;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions) MultiThreadedDLL - - Level1 - ProgramDatabase CompileAsC diff --git a/libs/win32/mpg123/libmpg123.2010.vcxproj b/libs/win32/mpg123/libmpg123.2010.vcxproj index 3a04f6adc7..43b0a14457 100644 --- a/libs/win32/mpg123/libmpg123.2010.vcxproj +++ b/libs/win32/mpg123/libmpg123.2010.vcxproj @@ -48,27 +48,23 @@ + + + + <_ProjectFileVersion>10.0.30319.1 - .\Debug\ - .\Debug\ - $(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - .\Release\ - .\Release\ - $(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ @@ -78,13 +74,7 @@ true EnableFastChecks MultiThreadedDebugDLL - - - $(IntDir) - .\Debug/ - $(IntDir) Level4 - ProgramDatabase 4100;4018;4244;4127;4189;4389;4702;4706;%(DisableSpecificWarnings) false @@ -100,10 +90,7 @@ true EnableFastChecks MultiThreadedDebugDLL - - Level4 - ProgramDatabase 4100;4018;4244;4127;4189;4389;4702;4706;%(DisableSpecificWarnings) false @@ -113,13 +100,7 @@ src;$(ProjectDir)libmpg123;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;OPT_GENERIC;strcasecmp=stricmp;strncasecmp=strnicmp;%(PreprocessorDefinitions) MultiThreadedDLL - - - $(IntDir) - .\Release/ - $(IntDir) Level4 - ProgramDatabase 4100;4018;4244;4127;4189;4389;4702;4706;%(DisableSpecificWarnings) false @@ -132,10 +113,7 @@ src;$(ProjectDir)libmpg123;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;OPT_GENERIC;strcasecmp=stricmp;strncasecmp=strnicmp;%(PreprocessorDefinitions) MultiThreadedDLL - - Level4 - ProgramDatabase 4100;4018;4244;4127;4189;4389;4702;4706;%(DisableSpecificWarnings) false diff --git a/libs/win32/pcre/libpcre.2010.vcxproj b/libs/win32/pcre/libpcre.2010.vcxproj index 56b39be5a0..ecc960058f 100644 --- a/libs/win32/pcre/libpcre.2010.vcxproj +++ b/libs/win32/pcre/libpcre.2010.vcxproj @@ -83,9 +83,11 @@ + + @@ -95,21 +97,15 @@ + + <_ProjectFileVersion>10.0.30319.1 - $(Configuration)\ - $(Configuration)\ - $(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - $(Configuration)\ - $(Configuration)\ - $(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ $(SolutionDir)Debug\ $(Configuration)\ false @@ -124,26 +120,12 @@ false - - - - - - - - - - %(Inputs) - %(Outputs) - _DEBUG;%(PreprocessorDefinitions) true true Win32 $(IntDir)libpcre.tlb - - Disabled @@ -152,13 +134,8 @@ true EnableFastChecks MultiThreadedDebugDLL - $(OutDir)libpcre.pch - - - $(IntDir) Level3 true - ProgramDatabase _DEBUG;%(PreprocessorDefinitions) @@ -174,24 +151,8 @@ true $(OutDir)$(ProjectName).bsc - - - - - - - - - - - - - - %(Inputs) - %(Outputs) - _DEBUG;%(PreprocessorDefinitions) true @@ -208,13 +169,8 @@ true EnableFastChecks MultiThreadedDebugDLL - $(OutDir)libpcre.pch - - - $(IntDir) Level3 true - ProgramDatabase _DEBUG;%(PreprocessorDefinitions) @@ -230,32 +186,14 @@ true $(OutDir)$(ProjectName).bsc - - - - - - - - - - - - - - %(Inputs) - %(Outputs) - NDEBUG;%(PreprocessorDefinitions) true true Win32 $(IntDir)libpcre.tlb - - MaxSpeed @@ -265,10 +203,6 @@ true MultiThreadedDLL true - $(OutDir)libpcre.pch - - - $(IntDir) Level3 true @@ -286,32 +220,14 @@ true $(OutDir)$(ProjectName).bsc - - - - - - - - - - - - - - %(Inputs) - %(Outputs) - NDEBUG;%(PreprocessorDefinitions) true true X64 $(IntDir)libpcre.tlb - - MaxSpeed @@ -321,10 +237,6 @@ true MultiThreadedDLL true - $(OutDir)libpcre.pch - - - $(IntDir) Level3 true @@ -342,10 +254,6 @@ true $(OutDir)$(ProjectName).bsc - - - - diff --git a/libs/win32/pocketsphinx/pocketsphinx.2010.vcxproj b/libs/win32/pocketsphinx/pocketsphinx.2010.vcxproj index 8828a56e61..e8756b8b13 100644 --- a/libs/win32/pocketsphinx/pocketsphinx.2010.vcxproj +++ b/libs/win32/pocketsphinx/pocketsphinx.2010.vcxproj @@ -50,31 +50,27 @@ + + + + <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)$(PlatformName)\$(Configuration)\ - $(Configuration)\ - $(SolutionDir)$(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - $(SolutionDir)$(PlatformName)\$(Configuration)\ - $(Configuration)\ true - $(SolutionDir)$(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ true @@ -83,9 +79,6 @@ true true Win32 - $(IntDir)pocketsphinx.tlb - - MaxSpeed @@ -95,10 +88,6 @@ true MultiThreadedDLL true - $(IntDir)pocketsphinx.pch - $(IntDir) - .\Release/ - $(IntDir) TurnOffAllWarnings true @@ -112,7 +101,6 @@ true - $(IntDir)pocketsphinx.bsc @@ -121,9 +109,6 @@ true true X64 - $(IntDir)pocketsphinx.tlb - - MaxSpeed @@ -133,7 +118,6 @@ true MultiThreadedDLL true - $(IntDir)pocketsphinx.pch TurnOffAllWarnings true @@ -148,7 +132,6 @@ true - $(IntDir)pocketsphinx.bsc @@ -157,9 +140,6 @@ true true Win32 - $(IntDir)pocketsphinx.tlb - - Disabled @@ -168,13 +148,8 @@ true EnableFastChecks MultiThreadedDebugDLL - $(IntDir)pocketsphinx.pch - $(IntDir) - .\Debug/ - $(IntDir) TurnOffAllWarnings true - EditAndContinue _DEBUG;%(PreprocessorDefinitions) @@ -186,15 +161,11 @@ true ..\..\..\Debug;%(AdditionalLibraryDirectories) true - $(IntDir)pocketsphinx.pdb false - - MachineX86 true - $(IntDir)pocketsphinx.bsc @@ -203,9 +174,6 @@ true true X64 - $(IntDir)pocketsphinx.tlb - - Disabled @@ -214,10 +182,8 @@ true EnableFastChecks MultiThreadedDebugDLL - $(IntDir)pocketsphinx.pch TurnOffAllWarnings true - ProgramDatabase _DEBUG;%(PreprocessorDefinitions) @@ -229,15 +195,11 @@ true ..\..\..\Debug;%(AdditionalLibraryDirectories) true - $(IntDir)pocketsphinx.pdb false - - MachineX64 true - $(IntDir)pocketsphinx.bsc diff --git a/libs/win32/pthread/pthread.2010.vcxproj b/libs/win32/pthread/pthread.2010.vcxproj index 61f09611ed..b6dd1a17ab 100644 --- a/libs/win32/pthread/pthread.2010.vcxproj +++ b/libs/win32/pthread/pthread.2010.vcxproj @@ -85,9 +85,11 @@ + + @@ -97,9 +99,11 @@ + + @@ -118,18 +122,14 @@ $(Configuration)\ $(Platform)\$(Configuration)\ $(Platform)\$(Configuration)\ - $(SolutionDir)$(PlatformName)\Debug\ - $(Configuration)\ true - $(SolutionDir)$(PlatformName)\Debug\ - $(Platform)\$(Configuration)\ true - $(SolutionDir)$(PlatformName)\Debug\ - $(Configuration)\ false - $(SolutionDir)$(PlatformName)\Debug\ - $(Platform)\$(Configuration)\ false + $(SolutionDir)$(PlatformName)\debug\ + $(SolutionDir)$(PlatformName)\release\ + $(SolutionDir)$(PlatformName)\release\ + $(SolutionDir)$(PlatformName)\debug\ @@ -281,9 +281,6 @@ true true Win32 - .\./pthread.tlb - - Disabled @@ -292,14 +289,8 @@ true EnableFastChecks MultiThreadedDebugDLL - .\./pthread.pch - $(IntDir) - $(IntDir) - $(IntDir)vc80.pdb - false Level3 true - ProgramDatabase _DEBUG;PTW32_RC_MSC;%(PreprocessorDefinitions) @@ -311,13 +302,10 @@ true true false - - MachineX86 true - .\./pthread.bsc @@ -326,9 +314,6 @@ true true X64 - .\./pthread.tlb - - Disabled @@ -337,14 +322,8 @@ true EnableFastChecks MultiThreadedDebugDLL - .\./pthread.pch - $(IntDir) - $(IntDir) - $(IntDir)vc80.pdb - false Level3 true - ProgramDatabase _DEBUG;PTW32_RC_MSC;%(PreprocessorDefinitions) @@ -356,13 +335,10 @@ true true false - - MachineX64 true - .\./pthread.bsc @@ -371,9 +347,6 @@ true true Win32 - .\./pthread.tlb - - MaxSpeed @@ -383,11 +356,6 @@ true MultiThreadedDLL true - .\./pthread.pch - $(IntDir) - $(IntDir) - $(IntDir)vc80.pdb - false Level3 true @@ -400,13 +368,10 @@ ws2_32.lib;%(AdditionalDependencies) true false - - MachineX86 true - .\./pthread.bsc @@ -415,9 +380,6 @@ true true X64 - .\./pthread.tlb - - MaxSpeed @@ -427,11 +389,6 @@ true MultiThreadedDLL true - .\./pthread.pch - $(IntDir) - $(IntDir) - $(IntDir)vc80.pdb - false Level3 true @@ -444,13 +401,10 @@ ws2_32.lib;%(AdditionalDependencies) true false - - MachineX64 true - .\./pthread.bsc diff --git a/libs/win32/sofia/libsofia_sip_ua_static.2010.vcxproj b/libs/win32/sofia/libsofia_sip_ua_static.2010.vcxproj index 1aca8e6aa8..5c889fd577 100644 --- a/libs/win32/sofia/libsofia_sip_ua_static.2010.vcxproj +++ b/libs/win32/sofia/libsofia_sip_ua_static.2010.vcxproj @@ -49,29 +49,23 @@ + + + + <_ProjectFileVersion>10.0.30319.1 - $(PlatformName)\$(Configuration)\ - $(PlatformName)\$(Configuration)\ - $(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - $(PlatformName)\$(Configuration)\ - $(PlatformName)\$(Configuration)\ - $(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - - @@ -89,12 +83,10 @@ if not exist "$(ProjectDir)$(IntDir)\auth_client.obj" "autogen.cmd" true EnableFastChecks MultiThreadedDebugDLL - $(IntDir) true Level4 true true - ProgramDatabase _DEBUG;%(PreprocessorDefinitions) @@ -105,7 +97,6 @@ if not exist "$(ProjectDir)$(IntDir)\auth_client.obj" "autogen.cmd" true - $(IntDir)libsofia_sip_ua_static.bsc @@ -138,7 +129,6 @@ if not exist "$(ProjectDir)$(IntDir)\auth_client.obj" "autogen.cmd" Level4 false true - ProgramDatabase _DEBUG;%(PreprocessorDefinitions) @@ -149,7 +139,6 @@ if not exist "$(ProjectDir)$(IntDir)\auth_client.obj" "autogen.cmd" true - $(IntDir)libsofia_sip_ua_static.bsc @@ -170,7 +159,6 @@ if not exist "$(ProjectDir)$(IntDir)\auth_client.obj" "autogen.cmd" true MultiThreadedDLL true - $(IntDir) true Level4 true @@ -185,7 +173,6 @@ if not exist "$(ProjectDir)$(IntDir)\auth_client.obj" "autogen.cmd" true - $(IntDir)libsofia_sip_ua_static.bsc @@ -223,7 +210,6 @@ if not exist "$(ProjectDir)$(IntDir)\auth_client.obj" "autogen.cmd" true - $(IntDir)libsofia_sip_ua_static.bsc diff --git a/libs/win32/sphinxbase/sphinxbase.2010.vcxproj b/libs/win32/sphinxbase/sphinxbase.2010.vcxproj index cfe41baef4..443233f137 100644 --- a/libs/win32/sphinxbase/sphinxbase.2010.vcxproj +++ b/libs/win32/sphinxbase/sphinxbase.2010.vcxproj @@ -50,31 +50,27 @@ + + + + <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)$(PlatformName)\$(Configuration)\ - $(Configuration)\ - $(SolutionDir)$(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - $(SolutionDir)$(PlatformName)\$(Configuration)\ - $(Configuration)\ true - $(SolutionDir)$(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ true @@ -83,9 +79,6 @@ true true Win32 - $(IntDir)sphinxbase.tlb - - MaxSpeed @@ -95,10 +88,6 @@ true MultiThreadedDLL true - $(IntDir)sphinxbase.pch - $(IntDir) - .\Release/ - $(IntDir) TurnOffAllWarnings true @@ -112,7 +101,6 @@ true - $(IntDir)sphinxbase.bsc @@ -121,9 +109,6 @@ true true X64 - $(IntDir)sphinxbase.tlb - - MaxSpeed @@ -133,7 +118,6 @@ true MultiThreadedDLL true - $(IntDir)sphinxbase.pch TurnOffAllWarnings true @@ -148,22 +132,14 @@ true - $(IntDir)sphinxbase.bsc - - - - _DEBUG;%(PreprocessorDefinitions) true true Win32 - $(IntDir)sphinxbase.tlb - - Disabled @@ -172,13 +148,8 @@ true EnableFastChecks MultiThreadedDebugDLL - $(IntDir)sphinxbase.pch - $(IntDir) - .\Debug/ - $(IntDir) TurnOffAllWarnings true - EditAndContinue _DEBUG;%(PreprocessorDefinitions) @@ -186,35 +157,22 @@ winmm.lib;%(AdditionalDependencies) - $(OutDir)$(ProjectName).dll true ..\..\..\Debug;%(AdditionalLibraryDirectories) true - $(IntDir)sphinxbase.pdb false - - - $(IntDir)/sphinxbase.lib MachineX86 true - $(IntDir)sphinxbase.bsc - - - - _DEBUG;%(PreprocessorDefinitions) true true X64 - $(IntDir)sphinxbase.tlb - - Disabled @@ -223,10 +181,8 @@ true EnableFastChecks MultiThreadedDebugDLL - $(IntDir)sphinxbase.pch TurnOffAllWarnings true - ProgramDatabase _DEBUG;%(PreprocessorDefinitions) @@ -234,19 +190,14 @@ winmm.lib;%(AdditionalDependencies) - $(OutDir)$(ProjectName).dll true ..\..\..\Debug;%(AdditionalLibraryDirectories) true - $(IntDir)sphinxbase.pdb false - - MachineX64 true - $(IntDir)sphinxbase.bsc diff --git a/libs/win32/sqlite/sqlite.2010.vcxproj b/libs/win32/sqlite/sqlite.2010.vcxproj index 0893ae6da4..39df9afb99 100644 --- a/libs/win32/sqlite/sqlite.2010.vcxproj +++ b/libs/win32/sqlite/sqlite.2010.vcxproj @@ -84,9 +84,11 @@ + + @@ -96,21 +98,15 @@ + + <_ProjectFileVersion>10.0.30319.1 - $(Configuration)\ - $(Configuration)\ - $(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - $(Configuration)\ - $(Configuration)\ - $(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ $(SolutionDir)Debug\ $(Configuration)\ false @@ -141,10 +137,7 @@ if exist "$(ProjectDir)..\..\sqlite\src\keywordhash.h" del "$(ProjectDir)..\..\s true EnableFastChecks MultiThreadedDebugDLL - - TurnOffAllWarnings - ProgramDatabase @@ -171,10 +164,7 @@ if exist "$(ProjectDir)..\..\sqlite\src\keywordhash.h" del "$(ProjectDir)..\..\s true EnableFastChecks MultiThreadedDebugDLL - - TurnOffAllWarnings - ProgramDatabase @@ -195,10 +185,7 @@ if exist "$(ProjectDir)..\..\sqlite\src\keywordhash.h" del "$(ProjectDir)..\..\s $(ProjectDir);$(ProjectDir)..\..\sqlite\src;%(AdditionalIncludeDirectories) _CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32;NDEBUG;_LIB;THREADSAFE=1;%(PreprocessorDefinitions) MultiThreadedDLL - - TurnOffAllWarnings - ProgramDatabase @@ -222,10 +209,7 @@ if exist "$(ProjectDir)..\..\sqlite\src\keywordhash.h" del "$(ProjectDir)..\..\s $(ProjectDir);$(ProjectDir)..\..\sqlite\src;%(AdditionalIncludeDirectories) _CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32;NDEBUG;_LIB;THREADSAFE=1;%(PreprocessorDefinitions) MultiThreadedDLL - - TurnOffAllWarnings - ProgramDatabase diff --git a/libs/win32/udns/libudns.2010.vcxproj b/libs/win32/udns/libudns.2010.vcxproj index 7cfdc7d6a7..a76baac114 100644 --- a/libs/win32/udns/libudns.2010.vcxproj +++ b/libs/win32/udns/libudns.2010.vcxproj @@ -48,27 +48,23 @@ + + + + <_ProjectFileVersion>10.0.30319.1 - $(PlatformName)\$(Configuration)\ - $(PlatformName)\$(Configuration)\ - $(PlatformName)\$(Configuration)\ - $(PlatformName)\$(Configuration)\ - $(PlatformName)\$(Configuration)\ - $(PlatformName)\$(Configuration)\ - $(PlatformName)\$(Configuration)\ - $(PlatformName)\$(Configuration)\ @@ -77,10 +73,7 @@ true EnableFastChecks MultiThreadedDebugDLL - - Level3 - ProgramDatabase @@ -88,10 +81,7 @@ Disabled WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) MultiThreadedDLL - - Level3 - ProgramDatabase @@ -104,10 +94,7 @@ true EnableFastChecks MultiThreadedDebugDLL - - Level3 - ProgramDatabase @@ -118,10 +105,7 @@ Disabled WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) MultiThreadedDLL - - Level3 - ProgramDatabase diff --git a/libs/xmlrpc-c/Windows/abyss.2010.vcxproj b/libs/xmlrpc-c/Windows/abyss.2010.vcxproj index b7020e0e1f..8f366a8c33 100644 --- a/libs/xmlrpc-c/Windows/abyss.2010.vcxproj +++ b/libs/xmlrpc-c/Windows/abyss.2010.vcxproj @@ -50,30 +50,30 @@ + + + + <_ProjectFileVersion>10.0.30319.1 - $(PlatformName)\$(Configuration)\ - $(PlatformName)\$(Configuration)\ - $(PlatformName)\$(Configuration)\ - $(PlatformName)\$(Configuration)\ - $(PlatformName)\$(Configuration)\ - $(PlatformName)\$(Configuration)\ - $(PlatformName)\$(Configuration)\ - $(PlatformName)\$(Configuration)\ + $(PlatformName)\abyss\$(Configuration)\ + $(PlatformName)\abyss\$(Configuration)\ + $(PlatformName)\abyss\$(Configuration)\ + $(PlatformName)\abyss\$(Configuration)\ @@ -83,13 +83,8 @@ true EnableFastChecks MultiThreadedDebugDLL - .\Debug\abyss/abyss.pch - .\Debug\abyss/ - .\Debug\abyss/ - .\Debug\abyss/ Level3 true - ProgramDatabase _DEBUG;%(PreprocessorDefinitions) @@ -114,12 +109,8 @@ true EnableFastChecks MultiThreadedDebugDLL - .\Debug\abyss/abyss.pch - $(IntDir)Abyss\ - $(IntDir)Abyss\vc90.pdb Level3 true - ProgramDatabase _DEBUG;%(PreprocessorDefinitions) @@ -142,10 +133,6 @@ true MultiThreadedDLL true - .\Release\Abyss/abyss.pch - .\Release\Abyss/ - .\Release\Abyss/ - .\Release\Abyss/ Level3 true @@ -173,9 +160,6 @@ true MultiThreadedDLL true - .\Release\Abyss/abyss.pch - $(IntDir)Abyss\ - $(IntDir)Abyss\vc90.pdb Level3 true diff --git a/libs/xmlrpc-c/Windows/xmlparse.2010.vcxproj b/libs/xmlrpc-c/Windows/xmlparse.2010.vcxproj index ea84796607..a747e32b84 100644 --- a/libs/xmlrpc-c/Windows/xmlparse.2010.vcxproj +++ b/libs/xmlrpc-c/Windows/xmlparse.2010.vcxproj @@ -50,30 +50,30 @@ + + + + <_ProjectFileVersion>10.0.30319.1 - $(PlatformName)\$(Configuration)\ - $(PlatformName)\$(Configuration)\ - $(PlatformName)\$(Configuration)\ - $(PlatformName)\$(Configuration)\ - $(PlatformName)\$(Configuration)\ - $(PlatformName)\$(Configuration)\ - $(PlatformName)\$(Configuration)\ - $(PlatformName)\$(Configuration)\ + $(PlatformName)\xmlparse\$(Configuration)\ + $(PlatformName)\xmlparse\$(Configuration)\ + $(PlatformName)\xmlparse\$(Configuration)\ + $(PlatformName)\xmlparse\$(Configuration)\ diff --git a/libs/xmlrpc-c/Windows/xmlrpc.2010.vcxproj b/libs/xmlrpc-c/Windows/xmlrpc.2010.vcxproj index be81a6edfd..bdc988cb1f 100644 --- a/libs/xmlrpc-c/Windows/xmlrpc.2010.vcxproj +++ b/libs/xmlrpc-c/Windows/xmlrpc.2010.vcxproj @@ -50,30 +50,30 @@ + + + + <_ProjectFileVersion>10.0.30319.1 - $(PlatformName)\$(Configuration)\ - $(PlatformName)\$(Configuration)\ - $(PlatformName)\$(Configuration)\ - $(PlatformName)\$(Configuration)\ - $(PlatformName)\$(Configuration)\ - $(PlatformName)\$(Configuration)\ - $(PlatformName)\$(Configuration)\ - $(PlatformName)\$(Configuration)\ + $(PlatformName)\xmlrpc\$(Configuration)\ + $(PlatformName)\xmlrpc\$(Configuration)\ + $(PlatformName)\xmlrpc\$(Configuration)\ + $(PlatformName)\xmlrpc\$(Configuration)\ @@ -85,7 +85,6 @@ MultiThreadedDebugDLL Level3 true - ProgramDatabase _DEBUG;%(PreprocessorDefinitions) @@ -112,7 +111,6 @@ MultiThreadedDebugDLL Level3 true - ProgramDatabase _DEBUG;%(PreprocessorDefinitions) diff --git a/libs/xmlrpc-c/Windows/xmltok.2010.vcxproj b/libs/xmlrpc-c/Windows/xmltok.2010.vcxproj index 0fa9e1be14..a34b3f1e1e 100644 --- a/libs/xmlrpc-c/Windows/xmltok.2010.vcxproj +++ b/libs/xmlrpc-c/Windows/xmltok.2010.vcxproj @@ -50,30 +50,30 @@ + + + + <_ProjectFileVersion>10.0.30319.1 - $(PlatformName)\$(Configuration)\ - $(PlatformName)\$(Configuration)\ - $(PlatformName)\$(Configuration)\ - $(PlatformName)\$(Configuration)\ - $(PlatformName)\$(Configuration)\ - $(PlatformName)\$(Configuration)\ - $(PlatformName)\$(Configuration)\ - $(PlatformName)\$(Configuration)\ + $(PlatformName)\xmltok\$(Configuration)\ + $(PlatformName)\xmltok\$(Configuration)\ + $(PlatformName)\xmltok\$(Configuration)\ + $(PlatformName)\xmltok\$(Configuration)\ @@ -85,7 +85,6 @@ MultiThreadedDebugDLL Level3 true - ProgramDatabase _DEBUG;%(PreprocessorDefinitions) @@ -112,7 +111,6 @@ MultiThreadedDebugDLL Level3 true - ProgramDatabase _DEBUG;%(PreprocessorDefinitions) diff --git a/src/mod/directories/mod_ldap/mod_ldap.2010.vcxproj b/src/mod/directories/mod_ldap/mod_ldap.2010.vcxproj index 916adba65b..9af73880d1 100644 --- a/src/mod/directories/mod_ldap/mod_ldap.2010.vcxproj +++ b/src/mod/directories/mod_ldap/mod_ldap.2010.vcxproj @@ -267,8 +267,6 @@ Wldap32.lib;%(AdditionalDependencies) - - $(ProjectDir)..\..\..\..\libs\openldap\$(OutDir);%(AdditionalLibraryDirectories) false diff --git a/src/mod/languages/mod_lua/lua/lua.2010.vcxproj b/src/mod/languages/mod_lua/lua/lua.2010.vcxproj index 13f6e011e2..dbf8aefb92 100644 --- a/src/mod/languages/mod_lua/lua/lua.2010.vcxproj +++ b/src/mod/languages/mod_lua/lua/lua.2010.vcxproj @@ -46,47 +46,35 @@ + + + + <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)$(PlatformName)\$(Configuration)\ - $(Configuration)\ - $(SolutionDir)$(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - $(SolutionDir)$(PlatformName)\$(Configuration)\ - $(Configuration)\ - $(SolutionDir)$(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ .;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;_WIN32;LUA_BUILD_AS_DLL;%(PreprocessorDefinitions) MultiThreadedDebugDLL - - - ProgramDatabase 4127; 4505;%(DisableSpecificWarnings) false - - true false - - - .\$(IntDir)lua5.1.lib MachineX86 @@ -98,20 +86,12 @@ .;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;_WIN32;LUA_BUILD_AS_DLL;%(PreprocessorDefinitions) MultiThreadedDebugDLL - - - ProgramDatabase 4127; 4505;%(DisableSpecificWarnings) false - - true false - - - .\$(IntDir)lua5.1.lib MachineX64 @@ -120,18 +100,10 @@ .;%(AdditionalIncludeDirectories) _CRT_SECURE_NO_DEPRECATE;_WIN32;LUA_BUILD_AS_DLL;%(PreprocessorDefinitions) MultiThreadedDLL - - - ProgramDatabase 4127; 4505;%(DisableSpecificWarnings) - - false - - - .\$(IntDir)lua5.1.lib MachineX86 @@ -143,18 +115,10 @@ .;%(AdditionalIncludeDirectories) _CRT_SECURE_NO_DEPRECATE;_WIN32;LUA_BUILD_AS_DLL;%(PreprocessorDefinitions) MultiThreadedDLL - - - ProgramDatabase 4127; 4505;%(DisableSpecificWarnings) - - false - - - .\$(IntDir)lua5.1.lib MachineX64 diff --git a/w32/extdll.props b/w32/extdll.props new file mode 100644 index 0000000000..f750e874aa --- /dev/null +++ b/w32/extdll.props @@ -0,0 +1,12 @@ + + + + + + <_ProjectFileVersion>10.0.30319.1 + $(SolutionDir)$(PlatformName)\$(Configuration)\ + $(PlatformName)\$(Configuration)\ + + + + \ No newline at end of file diff --git a/w32/extlib.props b/w32/extlib.props new file mode 100644 index 0000000000..8c595ac10a --- /dev/null +++ b/w32/extlib.props @@ -0,0 +1,12 @@ + + + + + + <_ProjectFileVersion>10.0.30319.1 + $(PlatformName)\$(Configuration)\ + $(PlatformName)\$(Configuration)\ + + + + \ No newline at end of file From 195905f8379f1a4f4506c20873e8cc82ebdd0888 Mon Sep 17 00:00:00 2001 From: Jeff Lenk Date: Sat, 10 Jul 2010 15:51:06 -0500 Subject: [PATCH 02/10] more tweaks for VS2010 --- libs/win32/Sound_Files/16khz.2010.vcxproj | 6 ++---- libs/win32/Sound_Files/16khzmusic.2010.vcxproj | 6 ++---- libs/win32/Sound_Files/32khz.2010.vcxproj | 6 ++---- libs/win32/Sound_Files/32khzmusic.2010.vcxproj | 6 ++---- libs/win32/Sound_Files/8khz.2010.vcxproj | 6 ++---- libs/win32/Sound_Files/8khzmusic.2010.vcxproj | 6 ++---- 6 files changed, 12 insertions(+), 24 deletions(-) diff --git a/libs/win32/Sound_Files/16khz.2010.vcxproj b/libs/win32/Sound_Files/16khz.2010.vcxproj index b6a532fba3..8c62a2d004 100644 --- a/libs/win32/Sound_Files/16khz.2010.vcxproj +++ b/libs/win32/Sound_Files/16khz.2010.vcxproj @@ -30,17 +30,15 @@ + + <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)$(Configuration)\ - $(Configuration)\ - $(SolutionDir)$(Configuration)\ - $(Configuration)\ diff --git a/libs/win32/Sound_Files/16khzmusic.2010.vcxproj b/libs/win32/Sound_Files/16khzmusic.2010.vcxproj index f6c03137d5..3dfa8b4d18 100644 --- a/libs/win32/Sound_Files/16khzmusic.2010.vcxproj +++ b/libs/win32/Sound_Files/16khzmusic.2010.vcxproj @@ -30,17 +30,15 @@ + + <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)$(Configuration)\ - $(Configuration)\ - $(SolutionDir)$(Configuration)\ - $(Configuration)\ diff --git a/libs/win32/Sound_Files/32khz.2010.vcxproj b/libs/win32/Sound_Files/32khz.2010.vcxproj index 090ce2e758..1546fba1f1 100644 --- a/libs/win32/Sound_Files/32khz.2010.vcxproj +++ b/libs/win32/Sound_Files/32khz.2010.vcxproj @@ -30,17 +30,15 @@ + + <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)$(Configuration)\ - $(Configuration)\ - $(SolutionDir)$(Configuration)\ - $(Configuration)\ diff --git a/libs/win32/Sound_Files/32khzmusic.2010.vcxproj b/libs/win32/Sound_Files/32khzmusic.2010.vcxproj index 37328d0c02..e3e1e403c8 100644 --- a/libs/win32/Sound_Files/32khzmusic.2010.vcxproj +++ b/libs/win32/Sound_Files/32khzmusic.2010.vcxproj @@ -30,17 +30,15 @@ + + <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)$(Configuration)\ - $(Configuration)\ - $(SolutionDir)$(Configuration)\ - $(Configuration)\ diff --git a/libs/win32/Sound_Files/8khz.2010.vcxproj b/libs/win32/Sound_Files/8khz.2010.vcxproj index 270c4bdbff..c5309f85e3 100644 --- a/libs/win32/Sound_Files/8khz.2010.vcxproj +++ b/libs/win32/Sound_Files/8khz.2010.vcxproj @@ -30,17 +30,15 @@ + + <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)$(Configuration)\ - $(Configuration)\ - $(SolutionDir)$(Configuration)\ - $(Configuration)\ diff --git a/libs/win32/Sound_Files/8khzmusic.2010.vcxproj b/libs/win32/Sound_Files/8khzmusic.2010.vcxproj index 40384525f4..d8744c0958 100644 --- a/libs/win32/Sound_Files/8khzmusic.2010.vcxproj +++ b/libs/win32/Sound_Files/8khzmusic.2010.vcxproj @@ -30,17 +30,15 @@ + + <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)$(Configuration)\ - $(Configuration)\ - $(SolutionDir)$(Configuration)\ - $(Configuration)\ From 3dfc0a86adb5f9a3898d7270b2d081a600347de8 Mon Sep 17 00:00:00 2001 From: Jeff Lenk Date: Sat, 10 Jul 2010 17:26:16 -0500 Subject: [PATCH 03/10] more tweaks for VS2010 - reduce unneeded builds --- libs/win32/Dowload 32khz Sounds.2010.vcxproj | 2 +- libs/win32/Dowload 32khz music.2010.vcxproj | 2 +- libs/win32/Download 16khz Sounds.2010.vcxproj | 2 +- libs/win32/Download 16khz music.2010.vcxproj | 2 +- libs/win32/Download 8khz Sounds.2010.vcxproj | 2 +- libs/win32/Download 8khz music.2010.vcxproj | 2 +- libs/win32/Download CELT.vcxproj | 2 +- libs/win32/Download FLITE.2010.vcxproj | 2 +- libs/win32/Download JSON.2010.vcxproj | 12 +++++++----- libs/win32/Download LAME.2010.vcxproj | 2 +- libs/win32/Download LIBSHOUT.2010.vcxproj | 2 +- libs/win32/Download OGG.2010.vcxproj | 2 +- libs/win32/Download PTHREAD.2010.vcxproj | 2 +- libs/win32/Download mpg123.2010.vcxproj | 2 +- libs/win32/Download pocketsphinx.2010.vcxproj | 2 +- libs/win32/Download sphinxbase.2010.vcxproj | 2 +- libs/win32/Download sphinxmodel.2010.vcxproj | 2 +- libs/win32/cleancount | 1 + 18 files changed, 24 insertions(+), 21 deletions(-) create mode 100644 libs/win32/cleancount diff --git a/libs/win32/Dowload 32khz Sounds.2010.vcxproj b/libs/win32/Dowload 32khz Sounds.2010.vcxproj index e6373ddd39..1f9eec5b05 100644 --- a/libs/win32/Dowload 32khz Sounds.2010.vcxproj +++ b/libs/win32/Dowload 32khz Sounds.2010.vcxproj @@ -59,7 +59,7 @@ - + Document Downloading 32khzsound. if not exist "$(ProjectDir)..\sounds\en\us\callie\voicemail\32000" cscript /nologo "$(ProjectDir)util.vbs" GetUnzipSounds en-us-callie 32000 "$(ProjectDir)..\sounds" "$(ProjectDir)..\..\build\sounds_version.txt" diff --git a/libs/win32/Dowload 32khz music.2010.vcxproj b/libs/win32/Dowload 32khz music.2010.vcxproj index 3c2acdfdc8..eed9135110 100644 --- a/libs/win32/Dowload 32khz music.2010.vcxproj +++ b/libs/win32/Dowload 32khz music.2010.vcxproj @@ -59,7 +59,7 @@ - + Document Downloading 32khzsound. set /P SOUND_VERSION=<"$(ProjectDir)..\..\build\moh_version.txt" diff --git a/libs/win32/Download 16khz Sounds.2010.vcxproj b/libs/win32/Download 16khz Sounds.2010.vcxproj index 024cac5723..a191394bc5 100644 --- a/libs/win32/Download 16khz Sounds.2010.vcxproj +++ b/libs/win32/Download 16khz Sounds.2010.vcxproj @@ -59,7 +59,7 @@ - + Document Downloading 16khzsound. if not exist "$(ProjectDir)..\sounds\en\us\callie\voicemail\16000" cscript /nologo "$(ProjectDir)util.vbs" GetUnzipSounds en-us-callie 16000 "$(ProjectDir)..\sounds" "$(ProjectDir)..\..\build\sounds_version.txt" diff --git a/libs/win32/Download 16khz music.2010.vcxproj b/libs/win32/Download 16khz music.2010.vcxproj index f73e3bc837..abc4dd42bf 100644 --- a/libs/win32/Download 16khz music.2010.vcxproj +++ b/libs/win32/Download 16khz music.2010.vcxproj @@ -59,7 +59,7 @@ - + Document Downloading 16khzsound. set /P SOUND_VERSION=<"$(ProjectDir)..\..\build\moh_version.txt" diff --git a/libs/win32/Download 8khz Sounds.2010.vcxproj b/libs/win32/Download 8khz Sounds.2010.vcxproj index a45c2b0094..2bdb178891 100644 --- a/libs/win32/Download 8khz Sounds.2010.vcxproj +++ b/libs/win32/Download 8khz Sounds.2010.vcxproj @@ -59,7 +59,7 @@ - + Document Downloading 8khzsound. if not exist "$(ProjectDir)..\sounds\en\us\callie\voicemail\8000" cscript /nologo "$(ProjectDir)util.vbs" GetUnzipSounds en-us-callie 8000 "$(ProjectDir)..\sounds" "$(ProjectDir)..\..\build\sounds_version.txt" diff --git a/libs/win32/Download 8khz music.2010.vcxproj b/libs/win32/Download 8khz music.2010.vcxproj index b8c62c7542..feef7cd991 100644 --- a/libs/win32/Download 8khz music.2010.vcxproj +++ b/libs/win32/Download 8khz music.2010.vcxproj @@ -59,7 +59,7 @@ - + Document Downloading 8khzsound. set /P SOUND_VERSION=<"$(ProjectDir)..\..\build\moh_version.txt" diff --git a/libs/win32/Download CELT.vcxproj b/libs/win32/Download CELT.vcxproj index 4b4fd0d83e..af8c9aa543 100644 --- a/libs/win32/Download CELT.vcxproj +++ b/libs/win32/Download CELT.vcxproj @@ -62,7 +62,7 @@ - + Document Downloading CELT. if not exist "$(ProjectDir)..\celt-0.7.1" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/downloads/libs/celt-0.7.1.tar.gz "$(ProjectDir).." diff --git a/libs/win32/Download FLITE.2010.vcxproj b/libs/win32/Download FLITE.2010.vcxproj index a3da32870a..d88acb941f 100644 --- a/libs/win32/Download FLITE.2010.vcxproj +++ b/libs/win32/Download FLITE.2010.vcxproj @@ -63,7 +63,7 @@ - + Document Downloading Flite. if not exist "$(ProjectDir)..\flite-1.3.99" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/downloads/libs/flite-1.3.99-latest.tar.gz "$(ProjectDir).." diff --git a/libs/win32/Download JSON.2010.vcxproj b/libs/win32/Download JSON.2010.vcxproj index ae7d6ca7cd..d0dad578f6 100644 --- a/libs/win32/Download JSON.2010.vcxproj +++ b/libs/win32/Download JSON.2010.vcxproj @@ -63,14 +63,16 @@ - + Document Downloading JSON. - if not exist "$(ProjectDir)..\json-c-0.9" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/downloads/libs/json-c-0.9.tar.gz "$(ProjectDir).." - $(ProjectDir)..\JSON;%(Outputs) + if not exist "$(ProjectDir)..\json-c-0.9" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/downloads/libs/json-c-0.9.tar.gz "$(ProjectDir).." + + $(ProjectDir)..\json-c-0.9;%(Outputs) Downloading JSON. - if not exist "$(ProjectDir)..\json-c-0.9" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/downloads/libs/json-c-0.9.tar.gz "$(ProjectDir).." - $(ProjectDir)..\JSON;%(Outputs) + if not exist "$(ProjectDir)..\json-c-0.9" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/downloads/libs/json-c-0.9.tar.gz "$(ProjectDir).." + + $(ProjectDir)..\json-c-0.9;%(Outputs) diff --git a/libs/win32/Download LAME.2010.vcxproj b/libs/win32/Download LAME.2010.vcxproj index 74dba6e3a1..0715177aff 100644 --- a/libs/win32/Download LAME.2010.vcxproj +++ b/libs/win32/Download LAME.2010.vcxproj @@ -63,7 +63,7 @@ - + Document Downloading Lame. if not exist "$(ProjectDir)..\lame-3.97" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/downloads/libs/lame-3.97.tar.gz "$(ProjectDir).." diff --git a/libs/win32/Download LIBSHOUT.2010.vcxproj b/libs/win32/Download LIBSHOUT.2010.vcxproj index dede9fa43c..971ad0cf9c 100644 --- a/libs/win32/Download LIBSHOUT.2010.vcxproj +++ b/libs/win32/Download LIBSHOUT.2010.vcxproj @@ -63,7 +63,7 @@ - + Document Downloading Flite. if not exist "$(ProjectDir)..\libshout-2.2.2" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/downloads/libs/libshout-2.2.2.tar.gz "$(ProjectDir).." diff --git a/libs/win32/Download OGG.2010.vcxproj b/libs/win32/Download OGG.2010.vcxproj index 8f9097ac6c..c6b4f1e930 100644 --- a/libs/win32/Download OGG.2010.vcxproj +++ b/libs/win32/Download OGG.2010.vcxproj @@ -63,7 +63,7 @@ - + Document Downloading Lame. if not exist "$(ProjectDir)..\libogg-1.1.3" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://downloads.xiph.org/releases/ogg/libogg-1.1.3.tar.gz "$(ProjectDir).." diff --git a/libs/win32/Download PTHREAD.2010.vcxproj b/libs/win32/Download PTHREAD.2010.vcxproj index c44d4a4024..ab35bb80b1 100644 --- a/libs/win32/Download PTHREAD.2010.vcxproj +++ b/libs/win32/Download PTHREAD.2010.vcxproj @@ -59,7 +59,7 @@ - + Document Downloading PTHREAD. if not exist "$(ProjectDir)..\pthreads-w32-2-7-0-release" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/downloads/libs/pthreads-w32-2-7-0-release.tar.gz "$(ProjectDir).." diff --git a/libs/win32/Download mpg123.2010.vcxproj b/libs/win32/Download mpg123.2010.vcxproj index 54e04aecc0..a135cfa1c9 100644 --- a/libs/win32/Download mpg123.2010.vcxproj +++ b/libs/win32/Download mpg123.2010.vcxproj @@ -63,7 +63,7 @@ - + Document Downloading Flite. if not exist "$(ProjectDir)..\mpg123" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/downloads/libs/mpg123.tar.gz "$(ProjectDir).." diff --git a/libs/win32/Download pocketsphinx.2010.vcxproj b/libs/win32/Download pocketsphinx.2010.vcxproj index 9d9f4e1a06..47c43cec45 100644 --- a/libs/win32/Download pocketsphinx.2010.vcxproj +++ b/libs/win32/Download pocketsphinx.2010.vcxproj @@ -59,7 +59,7 @@ - + Document Downloading pocketsphinx. if not exist "$(ProjectDir)..\pocketsphinx-0.5.99" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/downloads/libs/pocketsphinx-0.5.99-20091212.tar.gz "$(ProjectDir).." diff --git a/libs/win32/Download sphinxbase.2010.vcxproj b/libs/win32/Download sphinxbase.2010.vcxproj index 72a5df9ccb..6e70ab0d8c 100644 --- a/libs/win32/Download sphinxbase.2010.vcxproj +++ b/libs/win32/Download sphinxbase.2010.vcxproj @@ -59,7 +59,7 @@ - + Document Downloading sphinxbase. if not exist "$(ProjectDir)..\sphinxbase-0.4.99" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/downloads/libs/sphinxbase-0.4.99-20091212.tar.gz "$(ProjectDir).." diff --git a/libs/win32/Download sphinxmodel.2010.vcxproj b/libs/win32/Download sphinxmodel.2010.vcxproj index 182c7ccd48..42087f4479 100644 --- a/libs/win32/Download sphinxmodel.2010.vcxproj +++ b/libs/win32/Download sphinxmodel.2010.vcxproj @@ -63,7 +63,7 @@ - + Document Downloading sphinxmodel. if not exist "$(SolutionDir)\libs\Communicator_semi_40.cd_semi_6000" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/downloads/libs/communicator_semi_6000_20080321.tar.gz "$(ProjectDir).." diff --git a/libs/win32/cleancount b/libs/win32/cleancount new file mode 100644 index 0000000000..56a6051ca2 --- /dev/null +++ b/libs/win32/cleancount @@ -0,0 +1 @@ +1 \ No newline at end of file From 1277ac473e769dfb80ed11856ba221ebae45fae2 Mon Sep 17 00:00:00 2001 From: Jeff Lenk Date: Sat, 10 Jul 2010 20:59:00 -0500 Subject: [PATCH 04/10] more tweaks for VS2010 --- libs/win32/pcre/libpcre.2010.vcxproj | 10 - .../win32/pcre/pcre_chartables.c.2010.vcxproj | 181 ++++++++++++++++++ 2 files changed, 181 insertions(+), 10 deletions(-) create mode 100644 libs/win32/pcre/pcre_chartables.c.2010.vcxproj diff --git a/libs/win32/pcre/libpcre.2010.vcxproj b/libs/win32/pcre/libpcre.2010.vcxproj index ecc960058f..4ca6dbcb9d 100644 --- a/libs/win32/pcre/libpcre.2010.vcxproj +++ b/libs/win32/pcre/libpcre.2010.vcxproj @@ -125,7 +125,6 @@ true true Win32 - $(IntDir)libpcre.tlb Disabled @@ -149,7 +148,6 @@ true - $(OutDir)$(ProjectName).bsc @@ -158,9 +156,6 @@ true true X64 - $(IntDir)libpcre.tlb - - Disabled @@ -184,7 +179,6 @@ true - $(OutDir)$(ProjectName).bsc @@ -193,7 +187,6 @@ true true Win32 - $(IntDir)libpcre.tlb MaxSpeed @@ -218,7 +211,6 @@ true - $(OutDir)$(ProjectName).bsc @@ -227,7 +219,6 @@ true true X64 - $(IntDir)libpcre.tlb MaxSpeed @@ -252,7 +243,6 @@ true - $(OutDir)$(ProjectName).bsc diff --git a/libs/win32/pcre/pcre_chartables.c.2010.vcxproj b/libs/win32/pcre/pcre_chartables.c.2010.vcxproj new file mode 100644 index 0000000000..a7ce80f3b8 --- /dev/null +++ b/libs/win32/pcre/pcre_chartables.c.2010.vcxproj @@ -0,0 +1,181 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + libpcre Generate pcre_chartables.c + {1CED5987-A529-46DC-B30F-870D85FF9C94} + Generatepcre_chartablesc + Win32Proj + + + + Application + Unicode + true + + + Application + Unicode + + + Application + Unicode + true + + + Application + Unicode + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + true + true + false + false + + + $(PlatformName)\charttables\$(Configuration)\ + $(PlatformName)\charttables\$(Configuration)\ + $(PlatformName)\charttables\$(Configuration)\ + $(PlatformName)\charttables\$(Configuration)\ + + + + Disabled + ..\..\pcre\;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;HAVE_CONFIG_H;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDLL + Level3 + + + $(TargetPath) + true + Console + false + MachineX86 + + + if not exist "$(ProjectDir)pcre_chartables.c " "$(TargetPath)" "$(ProjectDir)pcre_chartables.c" + + + + + + + + + + + + + X64 + + + Disabled + ..\..\pcre\;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;HAVE_CONFIG_H;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDLL + Level3 + + + $(TargetPath) + true + Console + false + MachineX64 + + + if not exist "$(ProjectDir)pcre_chartables.c " "$(TargetPath)" "$(ProjectDir)pcre_chartables.c" + + + + + ..\..\pcre\;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;HAVE_CONFIG_H;%(PreprocessorDefinitions) + MultiThreadedDLL + Level3 + + + $(TargetPath) + true + Console + true + true + true + MachineX86 + + + if not exist "$(ProjectDir)pcre_chartables.c " "$(TargetPath)" "$(ProjectDir)pcre_chartables.c" + + + + + X64 + + + ..\..\pcre\;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;HAVE_CONFIG_H;%(PreprocessorDefinitions) + MultiThreadedDLL + Level3 + + + $(TargetPath) + true + Console + true + true + true + MachineX64 + + + if not exist "$(ProjectDir)pcre_chartables.c " "$(TargetPath)" "$(ProjectDir)pcre_chartables.c" + + + + + + + + + \ No newline at end of file From a999e7c05bf3137d50c45a0a1705e5f655c48569 Mon Sep 17 00:00:00 2001 From: Jeff Lenk Date: Sun, 11 Jul 2010 17:11:45 -0500 Subject: [PATCH 05/10] more tweaks for VS2010 --- libs/win32/pcre/libpcre.2010.vcxproj | 67 ---------------------------- 1 file changed, 67 deletions(-) diff --git a/libs/win32/pcre/libpcre.2010.vcxproj b/libs/win32/pcre/libpcre.2010.vcxproj index 4ca6dbcb9d..22db6b7a50 100644 --- a/libs/win32/pcre/libpcre.2010.vcxproj +++ b/libs/win32/pcre/libpcre.2010.vcxproj @@ -120,12 +120,6 @@ false - - _DEBUG;%(PreprocessorDefinitions) - true - true - Win32 - Disabled $(ProjectDir);$(ProjectDir)..\..\pcre;%(AdditionalIncludeDirectories) @@ -136,27 +130,11 @@ Level3 true - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - - - true - - - odbc32.lib;odbccp32.lib;%(AdditionalDependencies) - true - - _DEBUG;%(PreprocessorDefinitions) - true - true - X64 - Disabled $(ProjectDir);$(ProjectDir)..\..\pcre;%(AdditionalIncludeDirectories) @@ -167,27 +145,8 @@ Level3 true - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - - - true - - - odbc32.lib;odbccp32.lib;%(AdditionalDependencies) - - - true - - - NDEBUG;%(PreprocessorDefinitions) - true - true - Win32 - MaxSpeed OnlyExplicitInline @@ -199,27 +158,11 @@ Level3 true - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - true - - - odbc32.lib;odbccp32.lib;%(AdditionalDependencies) - true - - NDEBUG;%(PreprocessorDefinitions) - true - true - X64 - MaxSpeed OnlyExplicitInline @@ -231,16 +174,6 @@ Level3 true - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - true - - - odbc32.lib;odbccp32.lib;%(AdditionalDependencies) - true From 1734df82ca421efb6900e592c2897bc69ae1acc9 Mon Sep 17 00:00:00 2001 From: Anthony Minessale Date: Sun, 11 Jul 2010 21:00:13 -0500 Subject: [PATCH 06/10] presence_data_cols --- src/switch_core_sqldb.c | 145 ++++++++++++++++++++++++++++++++-------- 1 file changed, 117 insertions(+), 28 deletions(-) diff --git a/src/switch_core_sqldb.c b/src/switch_core_sqldb.c index 7fc32c0a3f..c67d553daa 100644 --- a/src/switch_core_sqldb.c +++ b/src/switch_core_sqldb.c @@ -964,6 +964,45 @@ static void *SWITCH_THREAD_FUNC switch_core_sql_thread(switch_thread_t *thread, return NULL; } +static char *parse_presence_data_cols(switch_event_t *event) +{ + char *cols[25] = { 0 }; + int col_count = 0; + char *data_copy; + switch_stream_handle_t stream = { 0 }; + int i; + char *r; + char col_name[128] = ""; + const char *data = switch_event_get_header(event, "variable_presence_data_cols"); + + if (zstr(data)) { + return NULL; + } + + data_copy = strdup(data); + + col_count = switch_split(data_copy, ':', cols); + + SWITCH_STANDARD_STREAM(stream); + + for (i = 0; i < col_count; i++) { + switch_snprintf(col_name, sizeof(col_name), "variable_%s", cols[i]); + stream.write_function(&stream, "%q='%q',", cols[i], switch_event_get_header_nil(event, col_name)); + } + + r = (char *) stream.data; + + if (end_of(r) == ',') { + end_of(r) = '\0'; + } + + switch_safe_free(data_copy); + + return r; + +} + + #define MAX_SQL 5 #define new_sql() switch_assert(sql_idx+1 < MAX_SQL); sql[sql_idx++] @@ -971,6 +1010,7 @@ static void core_event_handler(switch_event_t *event) { char *sql[MAX_SQL] = { 0 }; int sql_idx = 0; + char *extra_cols; switch_assert(event); @@ -1053,26 +1093,57 @@ static void core_event_handler(switch_event_t *event) break; case SWITCH_EVENT_CHANNEL_HOLD: case SWITCH_EVENT_CHANNEL_UNHOLD: - case SWITCH_EVENT_CHANNEL_EXECUTE: - new_sql() = switch_mprintf("update channels set application='%q',application_data='%q'," - "presence_id='%q',presence_data='%q' where uuid='%q' and hostname='%q'", - switch_event_get_header_nil(event, "application"), - switch_event_get_header_nil(event, "application-data"), - switch_event_get_header_nil(event, "channel-presence-id"), - switch_event_get_header_nil(event, "channel-presence-data"), - switch_event_get_header_nil(event, "unique-id"), switch_core_get_variable("hostname") + case SWITCH_EVENT_CHANNEL_EXECUTE: { - ); + if ((extra_cols = parse_presence_data_cols(event))) { + + new_sql() = switch_mprintf("update channels set application='%q',application_data='%q'," + "presence_id='%q',presence_data='%q',%s where uuid='%q' and hostname='%q'", + switch_event_get_header_nil(event, "application"), + switch_event_get_header_nil(event, "application-data"), + switch_event_get_header_nil(event, "channel-presence-id"), + switch_event_get_header_nil(event, "channel-presence-data"), + extra_cols, + switch_event_get_header_nil(event, "unique-id"), switch_core_get_variable("hostname") + + ); + + free(extra_cols); + + } else { + + new_sql() = switch_mprintf("update channels set application='%q',application_data='%q'," + "presence_id='%q',presence_data='%q' where uuid='%q' and hostname='%q'", + switch_event_get_header_nil(event, "application"), + switch_event_get_header_nil(event, "application-data"), + switch_event_get_header_nil(event, "channel-presence-id"), + switch_event_get_header_nil(event, "channel-presence-data"), + switch_event_get_header_nil(event, "unique-id"), switch_core_get_variable("hostname") + + ); + } + } break; case SWITCH_EVENT_CHANNEL_ORIGINATE: { - new_sql() = switch_mprintf("update channels set " - "presence_id='%q',presence_data='%q', call_uuid='%q' where uuid='%q' and hostname='%q'", - switch_event_get_header_nil(event, "channel-presence-id"), - switch_event_get_header_nil(event, "channel-presence-data"), - switch_event_get_header_nil(event, "channel-call-uuid"), - switch_event_get_header_nil(event, "unique-id"), switch_core_get_variable("hostname")); + if ((extra_cols = parse_presence_data_cols(event))) { + new_sql() = switch_mprintf("update channels set " + "presence_id='%q',presence_data='%q', call_uuid='%q',%s where uuid='%q' and hostname='%q'", + switch_event_get_header_nil(event, "channel-presence-id"), + switch_event_get_header_nil(event, "channel-presence-data"), + switch_event_get_header_nil(event, "channel-call-uuid"), + extra_cols, + switch_event_get_header_nil(event, "unique-id"), switch_core_get_variable("hostname")); + free(extra_cols); + } else { + new_sql() = switch_mprintf("update channels set " + "presence_id='%q',presence_data='%q', call_uuid='%q' where uuid='%q' and hostname='%q'", + switch_event_get_header_nil(event, "channel-presence-id"), + switch_event_get_header_nil(event, "channel-presence-data"), + switch_event_get_header_nil(event, "channel-call-uuid"), + switch_event_get_header_nil(event, "unique-id"), switch_core_get_variable("hostname")); + } } @@ -1124,19 +1195,37 @@ static void core_event_handler(switch_event_t *event) case CS_DESTROY: break; case CS_ROUTING: - new_sql() = switch_mprintf("update channels set state='%s',cid_name='%q',cid_num='%q'," - "ip_addr='%s',dest='%q',dialplan='%q',context='%q',presence_id='%q',presence_data='%q' " - "where uuid='%s' and hostname='%q'", - switch_event_get_header_nil(event, "channel-state"), - switch_event_get_header_nil(event, "caller-caller-id-name"), - switch_event_get_header_nil(event, "caller-caller-id-number"), - switch_event_get_header_nil(event, "caller-network-addr"), - switch_event_get_header_nil(event, "caller-destination-number"), - switch_event_get_header_nil(event, "caller-dialplan"), - switch_event_get_header_nil(event, "caller-context"), - switch_event_get_header_nil(event, "channel-presence-id"), - switch_event_get_header_nil(event, "channel-presence-data"), - switch_event_get_header_nil(event, "unique-id"), switch_core_get_variable("hostname")); + if ((extra_cols = parse_presence_data_cols(event))) { + new_sql() = switch_mprintf("update channels set state='%s',cid_name='%q',cid_num='%q'," + "ip_addr='%s',dest='%q',dialplan='%q',context='%q',presence_id='%q',presence_data='%q',%s " + "where uuid='%s' and hostname='%q'", + switch_event_get_header_nil(event, "channel-state"), + switch_event_get_header_nil(event, "caller-caller-id-name"), + switch_event_get_header_nil(event, "caller-caller-id-number"), + switch_event_get_header_nil(event, "caller-network-addr"), + switch_event_get_header_nil(event, "caller-destination-number"), + switch_event_get_header_nil(event, "caller-dialplan"), + switch_event_get_header_nil(event, "caller-context"), + switch_event_get_header_nil(event, "channel-presence-id"), + switch_event_get_header_nil(event, "channel-presence-data"), + extra_cols, + switch_event_get_header_nil(event, "unique-id"), switch_core_get_variable("hostname")); + free(extra_cols); + } else { + new_sql() = switch_mprintf("update channels set state='%s',cid_name='%q',cid_num='%q'," + "ip_addr='%s',dest='%q',dialplan='%q',context='%q',presence_id='%q',presence_data='%q' " + "where uuid='%s' and hostname='%q'", + switch_event_get_header_nil(event, "channel-state"), + switch_event_get_header_nil(event, "caller-caller-id-name"), + switch_event_get_header_nil(event, "caller-caller-id-number"), + switch_event_get_header_nil(event, "caller-network-addr"), + switch_event_get_header_nil(event, "caller-destination-number"), + switch_event_get_header_nil(event, "caller-dialplan"), + switch_event_get_header_nil(event, "caller-context"), + switch_event_get_header_nil(event, "channel-presence-id"), + switch_event_get_header_nil(event, "channel-presence-data"), + switch_event_get_header_nil(event, "unique-id"), switch_core_get_variable("hostname")); + } break; default: new_sql() = switch_mprintf("update channels set state='%s' where uuid='%s' and hostname='%q'", From d6f14d03075de222a0a9cd53735ad08e7236c4c8 Mon Sep 17 00:00:00 2001 From: Anthony Minessale Date: Sun, 11 Jul 2010 23:25:00 -0500 Subject: [PATCH 07/10] add fifo_member_usage app --- src/mod/applications/mod_fifo/mod_fifo.c | 82 +++++++++++++++++++++++- 1 file changed, 79 insertions(+), 3 deletions(-) diff --git a/src/mod/applications/mod_fifo/mod_fifo.c b/src/mod/applications/mod_fifo/mod_fifo.c index cc2589a4f4..3075c1d926 100644 --- a/src/mod/applications/mod_fifo/mod_fifo.c +++ b/src/mod/applications/mod_fifo/mod_fifo.c @@ -729,6 +729,7 @@ static void *SWITCH_THREAD_FUNC ringall_thread_run(switch_thread_t *thread, void char *parsed = NULL; switch_event_create_brackets(h->originate_string, '{', '}', ',', &ovars, &parsed); + switch_event_del_header(ovars, "fifo_outbound_uuid"); if (!h->timeout) h->timeout = 60; if (timeout < h->timeout) timeout = h->timeout; @@ -1363,6 +1364,46 @@ SWITCH_STANDARD_API(fifo_add_outbound_function) } +static switch_status_t hanguphook(switch_core_session_t *session) +{ + switch_channel_t *channel = switch_core_session_get_channel(session); + switch_channel_state_t state = switch_channel_get_state(channel); + const char *uuid = NULL; + char sql[256] = ""; + + if (state == CS_HANGUP || state == CS_ROUTING) { + if ((uuid = switch_channel_get_variable(channel, "fifo_outbound_uuid"))) { + switch_snprintf(sql, sizeof(sql), "update fifo_outbound set use_count=use_count-1, " + "outbound_call_count=outbound_call_count+1, next_avail=%ld + lag where uuid='%s'", + (long)switch_epoch_time_now(NULL), uuid); + + fifo_execute_sql(sql, globals.sql_mutex); + } + switch_core_event_hook_remove_state_change(session, hanguphook); + } + return SWITCH_STATUS_SUCCESS; +} + + +SWITCH_STANDARD_APP(fifo_member_usage_function) +{ + char *sql; + switch_channel_t *channel = switch_core_session_get_channel(session); + + if (zstr(data)) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid!\n"); + return; + } + + switch_channel_set_variable(channel, "fifo_outbound_uuid", data); + sql = switch_mprintf("update fifo_outbound set use_count=use_count+1,outbound_fail_count=0 where uuid='%s'", data); + + fifo_execute_sql(sql, globals.sql_mutex); + switch_safe_free(sql); + + switch_core_event_hook_add_state_change(session, hanguphook); + +} typedef enum { STRAT_MORE_PPL, @@ -2772,6 +2813,26 @@ const char bridge_sql[] = ");\n" ; + + +static void extract_fifo_outbound_uuid(char *string, char *uuid, switch_size_t len) +{ + switch_event_t *ovars; + char *parsed = NULL; + const char *fifo_outbound_uuid; + + switch_event_create(&ovars, SWITCH_EVENT_REQUEST_PARAMS); + + switch_event_create_brackets(string, '{', '}', ',', &ovars, &parsed); + + if ((fifo_outbound_uuid = switch_event_get_header(ovars, "fifo_outbound_uuid"))) { + switch_snprintf(uuid, len, "%s", fifo_outbound_uuid); + } + + switch_safe_free(parsed); + switch_event_destroy(&ovars); +} + static switch_status_t load_config(int reload, int del_all) { char *cf = "fifo.conf"; @@ -2919,8 +2980,13 @@ static switch_status_t load_config(int reload, int del_all) const char *taking_calls = switch_xml_attr_soft(member, "taking_calls"); char *name_dup, *p; char digest[SWITCH_MD5_DIGEST_STRING_SIZE] = { 0 }; - switch_md5_string(digest, (void *) member->txt, strlen(member->txt)); + if (switch_stristr("fifo_outbound_uuid=", member->txt)) { + extract_fifo_outbound_uuid(member->txt, digest, sizeof(digest)); + } else { + switch_md5_string(digest, (void *) member->txt, strlen(member->txt)); + } + if (simo) { simo_i = atoi(simo); } @@ -3023,7 +3089,11 @@ static void fifo_member_add(char *fifo_name, char *originate_string, int simo_co char *sql, *name_dup, *p; fifo_node_t *node = NULL; - switch_md5_string(digest, (void *) originate_string, strlen(originate_string)); + if (switch_stristr("fifo_outbound_uuid=", originate_string)) { + extract_fifo_outbound_uuid(originate_string, digest, sizeof(digest)); + } else { + switch_md5_string(digest, (void *) originate_string, strlen(originate_string)); + } sql = switch_mprintf("delete from fifo_outbound where fifo_name='%q' and uuid = '%q'", fifo_name, digest); switch_assert(sql); @@ -3065,7 +3135,11 @@ static void fifo_member_del(char *fifo_name, char *originate_string) callback_t cbt = { 0 }; fifo_node_t *node = NULL; - switch_md5_string(digest, (void *) originate_string, strlen(originate_string)); + if (switch_stristr("fifo_outbound_uuid=", originate_string)) { + extract_fifo_outbound_uuid(originate_string, digest, sizeof(digest)); + } else { + switch_md5_string(digest, (void *) originate_string, strlen(originate_string)); + } sql = switch_mprintf("delete from fifo_outbound where fifo_name='%q' and uuid = '%q' and hostname='%q'", fifo_name, digest, globals.hostname); switch_assert(sql); @@ -3212,6 +3286,8 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_fifo_load) /* connect my internal structure to the blank pointer passed to me */ *module_interface = switch_loadable_module_create_module_interface(pool, modname); SWITCH_ADD_APP(app_interface, "fifo", "Park with FIFO", FIFO_DESC, fifo_function, FIFO_USAGE, SAF_NONE); + SWITCH_ADD_APP(app_interface, "fifo_member_usage", "increment a member usage until the call ends", + "", fifo_member_usage_function, "", SAF_NONE); SWITCH_ADD_API(commands_api_interface, "fifo", "Return data about a fifo", fifo_api_function, FIFO_API_SYNTAX); SWITCH_ADD_API(commands_api_interface, "fifo_member", "Add members to a fifo", fifo_member_api_function, FIFO_MEMBER_API_SYNTAX); SWITCH_ADD_API(commands_api_interface, "fifo_add_outbound", "Add outbound members to a fifo", fifo_add_outbound_function, " []"); From a96cbd0e36b1443fef4afc19f95f392813a282ae Mon Sep 17 00:00:00 2001 From: Jeff Lenk Date: Mon, 12 Jul 2010 09:48:34 -0500 Subject: [PATCH 08/10] more tweaks for VS2010 --- libs/win32/apr-util/libaprutil.2010.vcxproj | 68 ++------------------- libs/win32/apr/libapr.2010.vcxproj | 28 ++------- 2 files changed, 10 insertions(+), 86 deletions(-) diff --git a/libs/win32/apr-util/libaprutil.2010.vcxproj b/libs/win32/apr-util/libaprutil.2010.vcxproj index a39f21e091..b105ab4bc8 100644 --- a/libs/win32/apr-util/libaprutil.2010.vcxproj +++ b/libs/win32/apr-util/libaprutil.2010.vcxproj @@ -73,17 +73,10 @@ if not exist "$(ProjectDir)..\..\apr-util\include\apu.h" type "$(ProjectDir)..\..\apr-util\include\apu.hw" > "$(ProjectDir)..\..\apr-util\include\apu.h" if not exist "$(ProjectDir)..\..\apr-util\include\apu_config.h" type "$(ProjectDir)..\..\apr-util\include\apu_config.hw" > "$(ProjectDir)..\..\apr-util\include\apu_config.h" if not exist "$(ProjectDir)..\..\apr-util\include\apu_select_dbm.h" type "$(ProjectDir)..\..\apr-util\include\apu_select_dbm.hw" > "$(ProjectDir)..\..\apr-util\include\apu_select_dbm.h" -if not exist "$(ProjectDir)..\..\apr-util\include\apu_want.h" type "$(ProjectDir)..\..\apr-util\include\apu_want.hw" > "$(ProjectDir)..\..\apr-util\include\apu_want.h" +if not exist "$(ProjectDir)..\..\apr-util\include\apu_want.h" type "$(ProjectDir)..\..\apr-util\include\apu_want.hw" > "$(ProjectDir)..\..\apr-util\include\apu_want.h" +xcopy "$(ProjectDir)..\..\apr-util\include\*.h" "$(ProjectDir)..\..\include\" /C /D /Y + - - _DEBUG;%(PreprocessorDefinitions) - true - true - Win32 - $(IntDir)libaprutil.tlb - - - /EHsc %(AdditionalOptions) Disabled @@ -100,7 +93,6 @@ if not exist "$(ProjectDir)..\..\apr-util\include\apu_want.h" type "$(ProjectDir ws2_32.lib;mswsock.lib;wldap32.lib;%(AdditionalDependencies) - $(OutDir)$(ProjectName).dll true %(AdditionalLibraryDirectories) true @@ -111,12 +103,7 @@ if not exist "$(ProjectDir)..\..\apr-util\include\apu_want.h" type "$(ProjectDir true - $(IntDir)libaprutil.bsc - - - - @@ -125,17 +112,9 @@ if not exist "$(ProjectDir)..\..\apr-util\include\apu.h" type "$(ProjectDir)..\. if not exist "$(ProjectDir)..\..\apr-util\include\apu_config.h" type "$(ProjectDir)..\..\apr-util\include\apu_config.hw" > "$(ProjectDir)..\..\apr-util\include\apu_config.h" if not exist "$(ProjectDir)..\..\apr-util\include\apu_select_dbm.h" type "$(ProjectDir)..\..\apr-util\include\apu_select_dbm.hw" > "$(ProjectDir)..\..\apr-util\include\apu_select_dbm.h" if not exist "$(ProjectDir)..\..\apr-util\include\apu_want.h" type "$(ProjectDir)..\..\apr-util\include\apu_want.hw" > "$(ProjectDir)..\..\apr-util\include\apu_want.h" +xcopy "$(ProjectDir)..\..\apr-util\include\*.h" "$(ProjectDir)..\..\include\" /C /D /Y - - _DEBUG;%(PreprocessorDefinitions) - true - true - X64 - $(IntDir)libaprutil.tlb - - - /EHsc %(AdditionalOptions) Disabled @@ -152,7 +131,6 @@ if not exist "$(ProjectDir)..\..\apr-util\include\apu_want.h" type "$(ProjectDir ws2_32.lib;mswsock.lib;wldap32.lib;%(AdditionalDependencies) - $(OutDir)$(ProjectName).dll true %(AdditionalLibraryDirectories) true @@ -163,12 +141,7 @@ if not exist "$(ProjectDir)..\..\apr-util\include\apu_want.h" type "$(ProjectDir true - $(IntDir)libaprutil.bsc - - - - @@ -177,17 +150,9 @@ if not exist "$(ProjectDir)..\..\apr-util\include\apu.h" type "$(ProjectDir)..\. if not exist "$(ProjectDir)..\..\apr-util\include\apu_config.h" type "$(ProjectDir)..\..\apr-util\include\apu_config.hw" > "$(ProjectDir)..\..\apr-util\include\apu_config.h" if not exist "$(ProjectDir)..\..\apr-util\include\apu_select_dbm.h" type "$(ProjectDir)..\..\apr-util\include\apu_select_dbm.hw" > "$(ProjectDir)..\..\apr-util\include\apu_select_dbm.h" if not exist "$(ProjectDir)..\..\apr-util\include\apu_want.h" type "$(ProjectDir)..\..\apr-util\include\apu_want.hw" > "$(ProjectDir)..\..\apr-util\include\apu_want.h" +xcopy "$(ProjectDir)..\..\apr-util\include\*.h" "$(ProjectDir)..\..\include\" /C /D /Y - - NDEBUG;%(PreprocessorDefinitions) - true - true - Win32 - $(IntDir)libaprutil.tlb - - - MaxSpeed OnlyExplicitInline @@ -206,7 +171,6 @@ if not exist "$(ProjectDir)..\..\apr-util\include\apu_want.h" type "$(ProjectDir ws2_32.lib;mswsock.lib;wldap32.lib;%(AdditionalDependencies) - $(OutDir)$(ProjectName).dll true %(AdditionalLibraryDirectories) true @@ -214,17 +178,11 @@ if not exist "$(ProjectDir)..\..\apr-util\include\apu_want.h" type "$(ProjectDir true 0x6EE60000 false - $(IntDir)libaprutil-1.lib MachineX86 true - $(IntDir)libaprutil.bsc - - - - @@ -233,17 +191,9 @@ if not exist "$(ProjectDir)..\..\apr-util\include\apu.h" type "$(ProjectDir)..\. if not exist "$(ProjectDir)..\..\apr-util\include\apu_config.h" type "$(ProjectDir)..\..\apr-util\include\apu_config.hw" > "$(ProjectDir)..\..\apr-util\include\apu_config.h" if not exist "$(ProjectDir)..\..\apr-util\include\apu_select_dbm.h" type "$(ProjectDir)..\..\apr-util\include\apu_select_dbm.hw" > "$(ProjectDir)..\..\apr-util\include\apu_select_dbm.h" if not exist "$(ProjectDir)..\..\apr-util\include\apu_want.h" type "$(ProjectDir)..\..\apr-util\include\apu_want.hw" > "$(ProjectDir)..\..\apr-util\include\apu_want.h" +xcopy "$(ProjectDir)..\..\apr-util\include\*.h" "$(ProjectDir)..\..\include\" /C /D /Y - - NDEBUG;%(PreprocessorDefinitions) - true - true - X64 - $(IntDir)libaprutil.tlb - - - MaxSpeed OnlyExplicitInline @@ -262,7 +212,6 @@ if not exist "$(ProjectDir)..\..\apr-util\include\apu_want.h" type "$(ProjectDir ws2_32.lib;mswsock.lib;wldap32.lib;%(AdditionalDependencies) - $(OutDir)$(ProjectName).dll true %(AdditionalLibraryDirectories) true @@ -274,12 +223,7 @@ if not exist "$(ProjectDir)..\..\apr-util\include\apu_want.h" type "$(ProjectDir true - $(IntDir)libaprutil.bsc - - - - diff --git a/libs/win32/apr/libapr.2010.vcxproj b/libs/win32/apr/libapr.2010.vcxproj index 6638ec7d43..5c6b686ee0 100644 --- a/libs/win32/apr/libapr.2010.vcxproj +++ b/libs/win32/apr/libapr.2010.vcxproj @@ -70,6 +70,7 @@ if not exist "$(ProjectDir)..\..\apr\include\apr.h" type "$(ProjectDir)apr.hw" > "$(ProjectDir)..\..\apr\include\apr.h" +xcopy "$(ProjectDir)..\..\apr\include\*.h" "$(ProjectDir)..\..\include\" /C /D /Y @@ -88,7 +89,6 @@ ws2_32.lib;mswsock.lib;rpcrt4.lib;advapi32.lib;%(AdditionalDependencies) - $(OutDir)$(ProjectName).dll true true Windows @@ -100,16 +100,12 @@ true - $(IntDir)libapr.bsc - - - - if not exist "$(ProjectDir)..\..\apr\include\apr.h" type "$(ProjectDir)apr.hw" > "$(ProjectDir)..\..\apr\include\apr.h" +xcopy "$(ProjectDir)..\..\apr\include\*.h" "$(ProjectDir)..\..\include\" /C /D /Y @@ -128,7 +124,6 @@ ws2_32.lib;mswsock.lib;rpcrt4.lib;advapi32.lib;%(AdditionalDependencies) - $(OutDir)$(ProjectName).dll true true Windows @@ -138,16 +133,12 @@ true - $(IntDir)libapr.bsc - - - - if not exist "$(ProjectDir)..\..\apr\include\apr.h" type "$(ProjectDir)apr.hw" > "$(ProjectDir)..\..\apr\include\apr.h" +xcopy "$(ProjectDir)..\..\apr\include\*.h" "$(ProjectDir)..\..\include\" /C /D /Y @@ -168,7 +159,6 @@ ws2_32.lib;mswsock.lib;rpcrt4.lib;advapi32.lib;%(AdditionalDependencies) - $(OutDir)$(ProjectName).dll true true Windows @@ -179,16 +169,12 @@ true - $(IntDir)libapr.bsc - - - - if not exist "$(ProjectDir)..\..\apr\include\apr.h" type "$(ProjectDir)apr.hw" > "$(ProjectDir)..\..\apr\include\apr.h" +xcopy "$(ProjectDir)..\..\apr\include\*.h" "$(ProjectDir)..\..\include\" /C /D /Y @@ -209,7 +195,6 @@ ws2_32.lib;mswsock.lib;rpcrt4.lib;advapi32.lib;%(AdditionalDependencies) - $(OutDir)$(ProjectName).dll true true Windows @@ -220,12 +205,7 @@ true - $(IntDir)libapr.bsc - - - - From 859b713ea7a4ffd9da6ed2e274260f89cb2ceb1e Mon Sep 17 00:00:00 2001 From: Jeff Lenk Date: Mon, 12 Jul 2010 10:01:46 -0500 Subject: [PATCH 09/10] more tweaks for VS2010 --- libs/libteletone/libteletone.2010.vcxproj | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/libs/libteletone/libteletone.2010.vcxproj b/libs/libteletone/libteletone.2010.vcxproj index e8335ddd41..8d2c30a66a 100644 --- a/libs/libteletone/libteletone.2010.vcxproj +++ b/libs/libteletone/libteletone.2010.vcxproj @@ -48,19 +48,19 @@ - + - + - + - + @@ -79,7 +79,6 @@ true - $(ProjectDir)teletone.def false false false @@ -102,7 +101,6 @@ true - $(ProjectDir)teletone.def false false false @@ -120,7 +118,6 @@ true - $(ProjectDir)teletone.def false @@ -137,7 +134,6 @@ true - $(ProjectDir)teletone.def false MachineX64 From 93d38441a91505631fdc4b32629d07d976700de8 Mon Sep 17 00:00:00 2001 From: Anthony Minessale Date: Mon, 12 Jul 2010 12:00:53 -0500 Subject: [PATCH 10/10] refactor --- src/mod/applications/mod_fifo/mod_fifo.c | 70 +++++++++++------------- 1 file changed, 33 insertions(+), 37 deletions(-) diff --git a/src/mod/applications/mod_fifo/mod_fifo.c b/src/mod/applications/mod_fifo/mod_fifo.c index 3075c1d926..2e4df02e91 100644 --- a/src/mod/applications/mod_fifo/mod_fifo.c +++ b/src/mod/applications/mod_fifo/mod_fifo.c @@ -136,7 +136,11 @@ static switch_status_t fifo_queue_pop(fifo_queue_t *queue, switch_event_t **pop, return SWITCH_STATUS_FALSE; } - *pop = queue->data[0]; + if (remove) { + *pop = queue->data[0]; + } else { + switch_event_dup(pop, queue->data[0]); + } if (remove) { for (i = 1; i < queue->idx; i++) { @@ -169,7 +173,12 @@ static switch_status_t fifo_queue_pop_nameval(fifo_queue_t *queue, const char *n for (j = 0; j < queue->idx; j++) { const char *j_val = switch_event_get_header(queue->data[j], name); if (j_val && val && !strcmp(j_val, val)) { - *pop = queue->data[j]; + + if (remove) { + *pop = queue->data[j]; + } else { + switch_event_dup(pop, queue->data[j]); + } break; } } @@ -178,7 +187,7 @@ static switch_status_t fifo_queue_pop_nameval(fifo_queue_t *queue, const char *n switch_mutex_unlock(queue->mutex); return SWITCH_STATUS_FALSE; } - + if (remove) { for (i = j+1; i < queue->idx; i++) { queue->data[i-1] = queue->data[i]; @@ -688,7 +697,7 @@ static void *SWITCH_THREAD_FUNC ringall_thread_run(switch_thread_t *thread, void switch_caller_extension_t *extension = NULL; switch_channel_t *channel; char *caller_id_name = NULL, *cid_num = NULL, *id = NULL; - switch_event_t *pop = NULL; + switch_event_t *pop = NULL, *pop_dup = NULL; fifo_queue_t *q = NULL; int x = 0; switch_event_t *event; @@ -697,8 +706,7 @@ static void *SWITCH_THREAD_FUNC ringall_thread_run(switch_thread_t *thread, void switch_uuid_get(&uuid); switch_uuid_format(uuid_str, &uuid); - - + if (!cbh->rowcount) { goto end; } @@ -712,7 +720,7 @@ static void *SWITCH_THREAD_FUNC ringall_thread_run(switch_thread_t *thread, void if (node) { switch_mutex_lock(node->mutex); node->busy++; - node->ring_consumer_count++; + node->ring_consumer_count = cbh->rowcount; switch_mutex_unlock(node->mutex); } else { goto end; @@ -748,41 +756,28 @@ static void *SWITCH_THREAD_FUNC ringall_thread_run(switch_thread_t *thread, void if (!timeout) timeout = 60; + pop = pop_dup = NULL; + for (x = 0; x < MAX_PRI; x++) { q = node->fifo_list[x]; - switch_mutex_lock(q->mutex); - - if (fifo_queue_pop_nameval(q, "variable_fifo_vip", "true", &pop, SWITCH_FALSE) == SWITCH_STATUS_SUCCESS && pop) { - goto found; + if (fifo_queue_pop_nameval(q, "variable_fifo_vip", "true", &pop_dup, SWITCH_FALSE) == SWITCH_STATUS_SUCCESS && pop_dup) { + pop = pop_dup; } - switch_mutex_unlock(q->mutex); - q = NULL; } if (!pop) { for (x = 0; x < MAX_PRI; x++) { q = node->fifo_list[x]; - switch_mutex_lock(q->mutex); - - if (fifo_queue_pop(node->fifo_list[x], &pop, SWITCH_FALSE) == SWITCH_STATUS_SUCCESS && pop) { - goto found; + if (fifo_queue_pop(node->fifo_list[x], &pop_dup, SWITCH_FALSE) == SWITCH_STATUS_SUCCESS && pop_dup) { + pop = pop_dup; } } - switch_mutex_unlock(q->mutex); - q = NULL; } - found: - - - if (!q) goto end; - if (!pop) { - if (q) switch_mutex_unlock(q->mutex); goto end; } - - + if (!switch_event_get_header(ovars, "origination_caller_id_name")) { if ((caller_id_name = switch_event_get_header(pop, "caller-caller-id-name"))) { if (node->outbound_name) { @@ -828,8 +823,6 @@ static void *SWITCH_THREAD_FUNC ringall_thread_run(switch_thread_t *thread, void switch_event_fire(&event); } - switch_mutex_unlock(q->mutex); - pop = NULL; status = switch_ivr_originate(NULL, &session, &cause, originate_string, timeout, NULL, NULL, NULL, NULL, ovars, SOF_NONE, NULL); @@ -886,11 +879,14 @@ static void *SWITCH_THREAD_FUNC ringall_thread_run(switch_thread_t *thread, void switch_safe_free(originate_string); switch_event_destroy(&ovars); + + if (pop_dup) { + switch_event_destroy(&pop_dup); + } + if (node) { switch_mutex_lock(node->mutex); - if (node->ring_consumer_count-- < 0) { - node->ring_consumer_count = 0; - } + node->ring_consumer_count = 0; if (node->busy) node->busy--; switch_mutex_unlock(node->mutex); } @@ -3147,11 +3143,11 @@ static void fifo_member_del(char *fifo_name, char *originate_string) free(sql); switch_mutex_lock(globals.mutex); - if (!(node = switch_core_hash_find(globals.fifo_hash, fifo_name))) { - node = create_node(fifo_name, 0, globals.sql_mutex); - node->ready = 1; - } - switch_mutex_unlock(globals.mutex); + if (!(node = switch_core_hash_find(globals.fifo_hash, fifo_name))) { + node = create_node(fifo_name, 0, globals.sql_mutex); + node->ready = 1; + } + switch_mutex_unlock(globals.mutex); cbt.buf = outbound_count; cbt.len = sizeof(outbound_count);