FS-4768 MSB_LNK_warnings.diff applied

diff --git a/libs/spandsp/src/libtiff.2012.vcxproj b/libs/spandsp/src/libtiff.2012.vcxproj
index 4317221d64e46b23c9f2cfbb071a6c873cb8e8db..52d1f24f7914d49fea98d8255d10a24cca427062 100644 (file)
--- a/libs/spandsp/src/libtiff.2012.vcxproj
+++ b/libs/spandsp/src/libtiff.2012.vcxproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>\r
+<?xml version="1.0" encoding="utf-8"?>\r
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
   <ItemGroup Label="ProjectConfigurations">\r
     <ProjectConfiguration Include="Debug|Win32">\r
@@ -84,7 +84,6 @@ if not exist "$(ProjectDir)../../tiff-4.0.2/libtiff/tif_config.h" copy "$(Projec
 </Command>\r
     </PreBuildEvent>\r
     <ClCompile>\r
-      <Optimization>Disabled</Optimization>\r
       <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
       <PreprocessorDefinitions>WIN32;_DEBUG;_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)</PreprocessorDefinitions>\r
       <MinimalRebuild>true</MinimalRebuild>\r
@@ -92,6 +91,7 @@ if not exist "$(ProjectDir)../../tiff-4.0.2/libtiff/tif_config.h" copy "$(Projec
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>\r
       <WarningLevel>TurnOffAllWarnings</WarningLevel>\r
       <CompileAs>CompileAsC</CompileAs>\r
+      <Optimization>Disabled</Optimization>\r
     </ClCompile>\r
   </ItemDefinitionGroup>\r
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">\r
@@ -200,4 +200,4 @@ if not exist "$(ProjectDir)../../tiff-4.0.2/libtiff/tif_config.h" copy "$(Projec
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
   <ImportGroup Label="ExtensionTargets">\r
   </ImportGroup>\r
-</Project>\r
+</Project>
\ No newline at end of file

diff --git a/libs/unimrcp/build/vsprops/apr.props b/libs/unimrcp/build/vsprops/apr.props
index 660a970181679412d85010e3dd1b524e390b4f71..ef8f3c8ec99a9dd4ed514fee4f8eb057503a9f15 100644 (file)
--- a/libs/unimrcp/build/vsprops/apr.props
+++ b/libs/unimrcp/build/vsprops/apr.props
@@ -1,16 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>\r
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
   <ImportGroup Label="PropertySheets">\r
-    <Import Project="$(ProjectDir)..\..\build\vsprops\unibase.props" />\r
+    <Import Project="$(ProjectDir)..\..\build\vsprops\unibase.props" Condition=" '$(UnibasePropsImported)' == '' "/>\r
   </ImportGroup>\r
   <PropertyGroup Label="UserMacros">\r
     <AprDir>$(LibRootDir)libs\apr</AprDir>\r
     <AprUtilDir>$(LibRootDir)libs\apr-util</AprUtilDir>\r
     <AprIconvDir>$(LibRootDir)libs\apr-iconv</AprIconvDir>\r
   </PropertyGroup>\r
-  <PropertyGroup>\r
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>\r
-  </PropertyGroup>\r
   <ItemDefinitionGroup>\r
     <ClCompile>\r
       <AdditionalIncludeDirectories>$(AprDir)\include;$(AprUtilDir)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r

diff --git a/libs/unimrcp/build/vsprops/apt.props b/libs/unimrcp/build/vsprops/apt.props
index 8ede1684dc1de63c4ed47232227ed81db99dc47c..ae6300b1cf593e38e5017c0cb253ecd23552d0d1 100644 (file)
--- a/libs/unimrcp/build/vsprops/apt.props
+++ b/libs/unimrcp/build/vsprops/apt.props
@@ -4,7 +4,7 @@
     <Import Project="apr.props" />\r
   </ImportGroup>\r
   <PropertyGroup>\r
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>\r
+    <AptPropsImported>true</AptPropsImported>\r
   </PropertyGroup>\r
   <ItemDefinitionGroup>\r
     <ClCompile>\r

diff --git a/libs/unimrcp/build/vsprops/mpf.props b/libs/unimrcp/build/vsprops/mpf.props
index ff68ceaef2b6ed7f47acbe1473fac500e1984178..6a7ef7070ac0ce79775e9ff718ca47086c672517 100644 (file)
--- a/libs/unimrcp/build/vsprops/mpf.props
+++ b/libs/unimrcp/build/vsprops/mpf.props
@@ -1,11 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>\r
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
   <ImportGroup Label="PropertySheets">\r
-    <Import Project="apt.props" />\r
+    <Import Project="apt.props" Condition=" '$(AptPropsImported)' == '' "/>\r
   </ImportGroup>\r
-  <PropertyGroup>\r
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>\r
-  </PropertyGroup>\r
   <ItemDefinitionGroup>\r
     <ClCompile>\r
       <AdditionalIncludeDirectories>$(ProjectRootDir)libs\mpf\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r

diff --git a/libs/unimrcp/build/vsprops/mrcp.props b/libs/unimrcp/build/vsprops/mrcp.props
index fa4ee3539bd28dfe3f47d5a14a0e2dcecdacd309..c4006c517e97bf730ca7cf479cbe542d4df947de 100644 (file)
--- a/libs/unimrcp/build/vsprops/mrcp.props
+++ b/libs/unimrcp/build/vsprops/mrcp.props
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>\r
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
   <ImportGroup Label="PropertySheets">\r
-    <Import Project="apt.props" />\r
+    <Import Project="apt.props" Condition=" '$(AptPropsImported)' == '' "/>\r
   </ImportGroup>\r
   <PropertyGroup>\r
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>\r
+    <MrcpPropsImported>true</MrcpPropsImported>\r
   </PropertyGroup>\r
   <ItemDefinitionGroup>\r
     <ClCompile>\r

diff --git a/libs/unimrcp/build/vsprops/mrcpsignaling.props b/libs/unimrcp/build/vsprops/mrcpsignaling.props
index 5e0c884a9ff27f85e30e3249782f9b67a23f2ea5..ee74131a39e339c56e391f60b7f202c6d5cf776e 100644 (file)
--- a/libs/unimrcp/build/vsprops/mrcpsignaling.props
+++ b/libs/unimrcp/build/vsprops/mrcpsignaling.props
@@ -2,11 +2,8 @@
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
   <ImportGroup Label="PropertySheets">\r
     <Import Project="mpf.props" />\r
-    <Import Project="mrcp.props" />\r
+    <Import Project="mrcp.props" Condition=" '$(MrcpPropsImported)' == ''" />\r
   </ImportGroup>\r
-  <PropertyGroup>\r
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>\r
-  </PropertyGroup>\r
   <ItemDefinitionGroup>\r
     <ClCompile>\r
       <AdditionalIncludeDirectories>$(ProjectRootDir)libs\mrcp-signaling\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r

diff --git a/libs/unimrcp/build/vsprops/mrcpv2transport.props b/libs/unimrcp/build/vsprops/mrcpv2transport.props
index c71836559bf251656500230939b63bb7685db347..dcefa1ddbee7e724b99ce3b8b9bad6d8546eaa2e 100644 (file)
--- a/libs/unimrcp/build/vsprops/mrcpv2transport.props
+++ b/libs/unimrcp/build/vsprops/mrcpv2transport.props
@@ -1,11 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>\r
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
   <ImportGroup Label="PropertySheets">\r
-    <Import Project="mrcp.props" />\r
+    <Import Project="mrcp.props" Condition=" '$(MrcpPropsImported)' == '' "/>\r
   </ImportGroup>\r
-  <PropertyGroup>\r
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>\r
-  </PropertyGroup>\r
   <ItemDefinitionGroup>\r
     <ClCompile>\r
       <AdditionalIncludeDirectories>$(ProjectRootDir)libs\mrcpv2-transport\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r

diff --git a/libs/unimrcp/build/vsprops/sofiasip.props b/libs/unimrcp/build/vsprops/sofiasip.props
index 3714d309776e371042c2a07e48c6139f45673ca5..ad901994ced5209fd691a5399d0d13ae1e31daf9 100644 (file)
--- a/libs/unimrcp/build/vsprops/sofiasip.props
+++ b/libs/unimrcp/build/vsprops/sofiasip.props
@@ -1,14 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>\r
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
   <ImportGroup Label="PropertySheets">\r
-    <Import Project="$(ProjectDir)..\..\build\vsprops\unibase.props" />\r
+    <Import Project="unibase.props" Condition=" '$(UnibasePropsImported)' == '' "/>\r
   </ImportGroup>\r
   <PropertyGroup Label="UserMacros">\r
     <SofiaDir>$(LibRootDir)libs\sofia-sip</SofiaDir>\r
   </PropertyGroup>\r
-  <PropertyGroup>\r
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>\r
-  </PropertyGroup>\r
   <ItemDefinitionGroup>\r
     <ClCompile>\r
       <AdditionalIncludeDirectories>$(SofiaDir)\win32;$(SofiaDir)\libsofia-sip-ua\su;$(SofiaDir)\libsofia-sip-ua\nua;$(SofiaDir)\libsofia-sip-ua\url;$(SofiaDir)\libsofia-sip-ua\sip;$(SofiaDir)\libsofia-sip-ua\msg;$(SofiaDir)\libsofia-sip-ua\sdp;$(SofiaDir)\libsofia-sip-ua\nta;$(SofiaDir)\libsofia-sip-ua\nea;$(SofiaDir)\libsofia-sip-ua\soa;$(SofiaDir)\libsofia-sip-ua\iptsec;$(SofiaDir)\libsofia-sip-ua\bnf;$(SofiaDir)\libsofia-sip-ua\features;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r

diff --git a/libs/unimrcp/build/vsprops/unibase.props b/libs/unimrcp/build/vsprops/unibase.props
index 097e8596ab9119698ba3935500ae1922d57a5bcc..69db3e3101512ae6372248094e4afe0d5daec83d 100644 (file)
--- a/libs/unimrcp/build/vsprops/unibase.props
+++ b/libs/unimrcp/build/vsprops/unibase.props
@@ -7,7 +7,9 @@
   <PropertyGroup>\r
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>\r
   </PropertyGroup>\r
-  <ItemDefinitionGroup>\r
+  <PropertyGroup>\r
+    <UnibasePropsImported>true</UnibasePropsImported>\r
+  </PropertyGroup><ItemDefinitionGroup>\r
     <ClCompile>\r
       <PreprocessorDefinitions>WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <WarningLevel>Level4</WarningLevel>\r

diff --git a/libs/unimrcp/build/vsprops/unidebug.props b/libs/unimrcp/build/vsprops/unidebug.props
index e9778995ab9983fae896edac6984c7dfffa48cc7..b345085066517814091176e842922a1b2fce169b 100644 (file)
--- a/libs/unimrcp/build/vsprops/unidebug.props
+++ b/libs/unimrcp/build/vsprops/unidebug.props
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>\r
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <ImportGroup Label="PropertySheets">\r
-    <Import Project="$(ProjectDir)..\..\build\vsprops\unibase.props" />\r
-  </ImportGroup>\r
+  <ImportGroup Label="PropertySheets" />\r
   <PropertyGroup>\r
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>\r
   </PropertyGroup>\r

diff --git a/libs/unimrcp/build/vsprops/unirelease.props b/libs/unimrcp/build/vsprops/unirelease.props
index 8081506815a8445df9a5dd644ff747fe27dc1ed9..8fee91840a84257a9d2022c7bfb95f48ce60220a 100644 (file)
--- a/libs/unimrcp/build/vsprops/unirelease.props
+++ b/libs/unimrcp/build/vsprops/unirelease.props
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>\r
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <ImportGroup Label="PropertySheets">\r
-    <Import Project="$(ProjectDir)..\..\build\vsprops\unibase.props" />\r
-  </ImportGroup>\r
+  <ImportGroup Label="PropertySheets" />\r
   <PropertyGroup>\r
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>\r
   </PropertyGroup>\r

diff --git a/libs/unimrcp/build/vsprops/unirtsp.props b/libs/unimrcp/build/vsprops/unirtsp.props
index 7ed01cb9a8a137184816e57af195494aec0aa877..43ccdedd95f1e7d5fbe30b1b3c7d7ac43e7fddcf 100644 (file)
--- a/libs/unimrcp/build/vsprops/unirtsp.props
+++ b/libs/unimrcp/build/vsprops/unirtsp.props
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>\r
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
   <ImportGroup Label="PropertySheets">\r
-    <Import Project="apt.props" />\r
+    <Import Project="apt.props" Condition=" '$(AptPropsImported)' == '' "/>\r
   </ImportGroup>\r
   <PropertyGroup>\r
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>\r

diff --git a/libs/win32/Download 8khz music.2012.vcxproj b/libs/win32/Download 8khz music.2012.vcxproj
index 082abf1496d2ec9e43cf7c5ce871a7aa8ce56d8c..fb23e53b42d761c65744a16223a2a12198010d87 100644 (file)
--- a/libs/win32/Download 8khz music.2012.vcxproj
+++ b/libs/win32/Download 8khz music.2012.vcxproj
@@ -28,6 +28,7 @@
     <PlatformToolset>v110</PlatformToolset>\r
   </PropertyGroup>\r
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <Import Project="$(SolutionDir)\w32\extdll.props" />\r
   <ImportGroup Label="ExtensionSettings">\r
   </ImportGroup>\r
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">\r

diff --git a/libs/win32/libjpeg/libjpeg.2012.vcxproj b/libs/win32/libjpeg/libjpeg.2012.vcxproj
index 774304650a17abdcd07813c201d89f87f5707731..dbf90a9761f6674ff217db4bd77bf6779f00c4b8 100644 (file)
--- a/libs/win32/libjpeg/libjpeg.2012.vcxproj
+++ b/libs/win32/libjpeg/libjpeg.2012.vcxproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>\r
+<?xml version="1.0" encoding="utf-8"?>\r
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
   <ItemGroup Label="ProjectConfigurations">\r
     <ProjectConfiguration Include="Debug|Win32">\r
@@ -190,13 +190,14 @@
     <ClCompile>\r
       <WarningLevel>Level3</WarningLevel>\r
       <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
-      <Optimization>Full</Optimization>\r
       <FunctionLevelLinking>true</FunctionLevelLinking>\r
       <IntrinsicFunctions>false</IntrinsicFunctions>\r
       <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS</PreprocessorDefinitions>\r
       <OmitFramePointers>true</OmitFramePointers>\r
       <EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations>\r
       <AdditionalIncludeDirectories>..\..\jpeg-8d;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <WholeProgramOptimization>false</WholeProgramOptimization>\r
+      <Optimization>Disabled</Optimization>\r
     </ClCompile>\r
     <Link>\r
       <SubSystem>Windows</SubSystem>\r
@@ -212,13 +213,16 @@
     <ClCompile>\r
       <WarningLevel>Level3</WarningLevel>\r
       <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
-      <Optimization>Full</Optimization>\r
+      <Optimization>Disabled</Optimization>\r
       <FunctionLevelLinking>true</FunctionLevelLinking>\r
       <IntrinsicFunctions>false</IntrinsicFunctions>\r
-      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS</PreprocessorDefinitions>\r
-      <OmitFramePointers>true</OmitFramePointers>\r
-      <EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations>\r
+      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS</PreprocessorDefinitions>\r
+      <OmitFramePointers>\r
+      </OmitFramePointers>\r
+      <EnableFiberSafeOptimizations>false</EnableFiberSafeOptimizations>\r
       <AdditionalIncludeDirectories>..\..\jpeg-8d;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <WholeProgramOptimization>false</WholeProgramOptimization>\r
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>\r
     </ClCompile>\r
     <Link>\r
       <SubSystem>Windows</SubSystem>\r
@@ -233,4 +237,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
   <ImportGroup Label="ExtensionTargets">\r
   </ImportGroup>\r
-</Project>\r
+</Project>
\ No newline at end of file

diff --git a/src/mod/event_handlers/mod_cdr_csv/mod_cdr_csv.2012.vcxproj b/src/mod/event_handlers/mod_cdr_csv/mod_cdr_csv.2012.vcxproj
index 1c970fd9c6f5e939556565ff9914fb0ab70219c0..ff68422591f96a19e082b890de8a23cc8f84db0f 100644 (file)
--- a/src/mod/event_handlers/mod_cdr_csv/mod_cdr_csv.2012.vcxproj
+++ b/src/mod/event_handlers/mod_cdr_csv/mod_cdr_csv.2012.vcxproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>\r
+<?xml version="1.0" encoding="utf-8"?>\r
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
   <ItemGroup Label="ProjectConfigurations">\r
     <ProjectConfiguration Include="Debug|Win32">\r
@@ -51,22 +51,18 @@
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">\r
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
     <Import Project="..\..\..\..\w32\module_release.props" />\r
-    <Import Project="..\..\..\..\w32\curl.props" />\r
   </ImportGroup>\r
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">\r
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
     <Import Project="..\..\..\..\w32\module_debug.props" />\r
-    <Import Project="..\..\..\..\w32\curl.props" />\r
   </ImportGroup>\r
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">\r
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
     <Import Project="..\..\..\..\w32\module_release.props" />\r
-    <Import Project="..\..\..\..\w32\curl.props" />\r
   </ImportGroup>\r
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">\r
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
     <Import Project="..\..\..\..\w32\module_debug.props" />\r
-    <Import Project="..\..\..\..\w32\curl.props" />\r
   </ImportGroup>\r
   <PropertyGroup Label="UserMacros" />\r
   <PropertyGroup>\r
@@ -142,4 +138,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
   <ImportGroup Label="ExtensionTargets">\r
   </ImportGroup>\r
-</Project>\r
+</Project>
\ No newline at end of file

diff --git a/src/mod/languages/mod_spidermonkey/mod_spidermonkey_core_db.2012.vcxproj b/src/mod/languages/mod_spidermonkey/mod_spidermonkey_core_db.2012.vcxproj
index 77652cb77085f6dd83254b25f9279bef22da4a84..0bb99e1bd8b12cde80726bc34e91f2043bc395ab 100644 (file)
--- a/src/mod/languages/mod_spidermonkey/mod_spidermonkey_core_db.2012.vcxproj
+++ b/src/mod/languages/mod_spidermonkey/mod_spidermonkey_core_db.2012.vcxproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>\r
+<?xml version="1.0" encoding="utf-8"?>\r
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
   <ItemGroup Label="ProjectConfigurations">\r
     <ProjectConfiguration Include="Debug|Win32">\r
@@ -76,9 +76,9 @@
   <PropertyGroup>\r
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>\r
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(PlatformName)\$(Configuration)\mod_spidermonkey_core_db\</IntDir>\r
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(PlatformName)\$(Configuration)\mod_spidermonkey_core_db</IntDir>\r
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(PlatformName)\$(Configuration)\mod_spidermonkey_core_db</IntDir>\r
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(PlatformName)\$(Configuration)\mod_spidermonkey_core_db</IntDir>\r
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(PlatformName)\$(Configuration)\mod_spidermonkey_core_db\</IntDir>\r
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(PlatformName)\$(Configuration)\mod_spidermonkey_core_db\</IntDir>\r
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(PlatformName)\$(Configuration)\mod_spidermonkey_core_db\</IntDir>\r
   </PropertyGroup>\r
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
     <PreBuildEvent>\r
@@ -182,4 +182,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
   <ImportGroup Label="ExtensionTargets">\r
   </ImportGroup>\r
-</Project>\r
+</Project>
\ No newline at end of file

diff --git a/src/mod/languages/mod_spidermonkey/mod_spidermonkey_curl.2012.vcxproj b/src/mod/languages/mod_spidermonkey/mod_spidermonkey_curl.2012.vcxproj
index 4402bf44cb197124bfa4511fadfb4889e16c3cce..ac6d3f8e33c6848f2c5b60b6a01a1091f2b0956a 100644 (file)
--- a/src/mod/languages/mod_spidermonkey/mod_spidermonkey_curl.2012.vcxproj
+++ b/src/mod/languages/mod_spidermonkey/mod_spidermonkey_curl.2012.vcxproj
@@ -76,9 +76,9 @@
   <PropertyGroup>\r
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>\r
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(PlatformName)\$(Configuration)\mod_spidermonkey_curl\</IntDir>\r
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(PlatformName)\$(Configuration)\mod_spidermonkey_curl</IntDir>\r
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(PlatformName)\$(Configuration)\mod_spidermonkey_curl</IntDir>\r
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(PlatformName)\$(Configuration)\mod_spidermonkey_curl</IntDir>\r
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(PlatformName)\$(Configuration)\mod_spidermonkey_curl\</IntDir>\r
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(PlatformName)\$(Configuration)\mod_spidermonkey_curl\</IntDir>\r
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(PlatformName)\$(Configuration)\mod_spidermonkey_curl\</IntDir>\r
   </PropertyGroup>\r
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
     <PreBuildEvent>\r

diff --git a/src/mod/languages/mod_spidermonkey/mod_spidermonkey_odbc.2012.vcxproj b/src/mod/languages/mod_spidermonkey/mod_spidermonkey_odbc.2012.vcxproj
index 31f591bc59e43be49eff24ec60ab38f2696bf2df..953a6cea37452a9cabdd3936f9584bafdaa5df65 100644 (file)
--- a/src/mod/languages/mod_spidermonkey/mod_spidermonkey_odbc.2012.vcxproj
+++ b/src/mod/languages/mod_spidermonkey/mod_spidermonkey_odbc.2012.vcxproj
@@ -76,9 +76,9 @@
   <PropertyGroup>\r
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>\r
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(PlatformName)\$(Configuration)\mod_spidermonkey_odbc\</IntDir>\r
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(PlatformName)\$(Configuration)\mod_spidermonkey_odbc</IntDir>\r
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(PlatformName)\$(Configuration)\mod_spidermonkey_odbc</IntDir>\r
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(PlatformName)\$(Configuration)\mod_spidermonkey_odbc</IntDir>\r
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(PlatformName)\$(Configuration)\mod_spidermonkey_odbc\</IntDir>\r
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(PlatformName)\$(Configuration)\mod_spidermonkey_odbc\</IntDir>\r
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(PlatformName)\$(Configuration)\mod_spidermonkey_odbc\</IntDir>\r
   </PropertyGroup>\r
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
     <PreBuildEvent>\r

diff --git a/src/mod/languages/mod_spidermonkey/mod_spidermonkey_socket.2012.vcxproj b/src/mod/languages/mod_spidermonkey/mod_spidermonkey_socket.2012.vcxproj
index 57aa959f05debc88d5b37436d0bb1f8fac7f6cc8..a0ff8d26ccbd61fd0bcc8393469d8e75608df8e6 100644 (file)
--- a/src/mod/languages/mod_spidermonkey/mod_spidermonkey_socket.2012.vcxproj
+++ b/src/mod/languages/mod_spidermonkey/mod_spidermonkey_socket.2012.vcxproj
@@ -78,9 +78,9 @@
   <PropertyGroup>\r
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>\r
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(PlatformName)\$(Configuration)\mod_spidermonkey_socket\</IntDir>\r
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(PlatformName)\$(Configuration)\mod_spidermonkey_socket</IntDir>\r
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(PlatformName)\$(Configuration)\mod_spidermonkey_socket</IntDir>\r
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(PlatformName)\$(Configuration)\mod_spidermonkey_socket</IntDir>\r
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(PlatformName)\$(Configuration)\mod_spidermonkey_socket\</IntDir>\r
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(PlatformName)\$(Configuration)\mod_spidermonkey_socket\</IntDir>\r
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(PlatformName)\$(Configuration)\mod_spidermonkey_socket\</IntDir>\r
   </PropertyGroup>\r
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
     <ClCompile>\r

diff --git a/src/mod/languages/mod_spidermonkey/mod_spidermonkey_teletone.2012.vcxproj b/src/mod/languages/mod_spidermonkey/mod_spidermonkey_teletone.2012.vcxproj
index 026a91db12c47adb7d4ca2d2ff4c6e6cbc56e769..5561cdb3a786bb8d33003fecbff90cdd8787c396 100644 (file)
--- a/src/mod/languages/mod_spidermonkey/mod_spidermonkey_teletone.2012.vcxproj
+++ b/src/mod/languages/mod_spidermonkey/mod_spidermonkey_teletone.2012.vcxproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>\r
+<?xml version="1.0" encoding="utf-8"?>\r
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
   <ItemGroup Label="ProjectConfigurations">\r
     <ProjectConfiguration Include="Debug|Win32">\r
@@ -76,9 +76,9 @@
   <PropertyGroup>\r
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>\r
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(PlatformName)\$(Configuration)\mod_spidermonkey_teletone\</IntDir>\r
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(PlatformName)\$(Configuration)\mod_spidermonkey_teletone</IntDir>\r
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(PlatformName)\$(Configuration)\mod_spidermonkey_teletone</IntDir>\r
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(PlatformName)\$(Configuration)\mod_spidermonkey_teletone</IntDir>\r
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(PlatformName)\$(Configuration)\mod_spidermonkey_teletone\</IntDir>\r
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(PlatformName)\$(Configuration)\mod_spidermonkey_teletone\</IntDir>\r
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(PlatformName)\$(Configuration)\mod_spidermonkey_teletone\</IntDir>\r
   </PropertyGroup>\r
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
     <PreBuildEvent>\r
@@ -192,4 +192,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
   <ImportGroup Label="ExtensionTargets">\r
   </ImportGroup>\r
-</Project>\r
+</Project>
\ No newline at end of file

diff --git a/src/mod/xml_int/mod_xml_cdr/mod_xml_cdr.2012.vcxproj b/src/mod/xml_int/mod_xml_cdr/mod_xml_cdr.2012.vcxproj
index c1fb0e58430a2ad95b5cbac101fdc7363f24ca48..e2ae1143af80872cad8ba480f77a750fde64e699 100644 (file)
--- a/src/mod/xml_int/mod_xml_cdr/mod_xml_cdr.2012.vcxproj
+++ b/src/mod/xml_int/mod_xml_cdr/mod_xml_cdr.2012.vcxproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>\r
+<?xml version="1.0" encoding="utf-8"?>\r
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
   <ItemGroup Label="ProjectConfigurations">\r
     <ProjectConfiguration Include="Debug|Win32">\r
@@ -51,22 +51,18 @@
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">\r
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
     <Import Project="..\..\..\..\w32\module_release.props" />\r
-    <Import Project="..\..\..\..\w32\curl.props" />\r
   </ImportGroup>\r
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">\r
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
     <Import Project="..\..\..\..\w32\module_debug.props" />\r
-    <Import Project="..\..\..\..\w32\curl.props" />\r
   </ImportGroup>\r
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">\r
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
     <Import Project="..\..\..\..\w32\module_release.props" />\r
-    <Import Project="..\..\..\..\w32\curl.props" />\r
   </ImportGroup>\r
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">\r
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
     <Import Project="..\..\..\..\w32\module_debug.props" />\r
-    <Import Project="..\..\..\..\w32\curl.props" />\r
   </ImportGroup>\r
   <PropertyGroup Label="UserMacros" />\r
   <PropertyGroup>\r
@@ -150,4 +146,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
   <ImportGroup Label="ExtensionTargets">\r
   </ImportGroup>\r
-</Project>\r
+</Project>
\ No newline at end of file

diff --git a/src/mod/xml_int/mod_xml_curl/mod_xml_curl.2012.vcxproj b/src/mod/xml_int/mod_xml_curl/mod_xml_curl.2012.vcxproj
index 0a1b31efee349d5d38279d468c03390a095fd200..1181a364c22426cd73753dc439fddf67d568c1d7 100644 (file)
--- a/src/mod/xml_int/mod_xml_curl/mod_xml_curl.2012.vcxproj
+++ b/src/mod/xml_int/mod_xml_curl/mod_xml_curl.2012.vcxproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>\r
+<?xml version="1.0" encoding="utf-8"?>\r
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
   <ItemGroup Label="ProjectConfigurations">\r
     <ProjectConfiguration Include="Debug|Win32">\r
@@ -51,22 +51,18 @@
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">\r
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
     <Import Project="..\..\..\..\w32\module_release.props" />\r
-    <Import Project="..\..\..\..\w32\curl.props" />\r
   </ImportGroup>\r
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">\r
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
     <Import Project="..\..\..\..\w32\module_debug.props" />\r
-    <Import Project="..\..\..\..\w32\curl.props" />\r
   </ImportGroup>\r
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">\r
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
     <Import Project="..\..\..\..\w32\module_release.props" />\r
-    <Import Project="..\..\..\..\w32\curl.props" />\r
   </ImportGroup>\r
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">\r
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
     <Import Project="..\..\..\..\w32\module_debug.props" />\r
-    <Import Project="..\..\..\..\w32\curl.props" />\r
   </ImportGroup>\r
   <PropertyGroup Label="UserMacros" />\r
   <PropertyGroup>\r
@@ -154,4 +150,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
   <ImportGroup Label="ExtensionTargets">\r
   </ImportGroup>\r
-</Project>\r
+</Project>
\ No newline at end of file

diff --git a/w32/curl.props b/w32/curl.props
index de23612923f55a5c9217132c5ff6cba0604b0b81..c4672876805c5400df100c7522b2940a2e243c36 100644 (file)
--- a/w32/curl.props
+++ b/w32/curl.props
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>\r
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
   <PropertyGroup>\r
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>\r
+    <CurlPropsImported>true</CurlPropsImported>\r
   </PropertyGroup>\r
   <ItemDefinitionGroup>\r
     <ClCompile>\r

diff --git a/w32/modules.props b/w32/modules.props
index 06c9c831d96402cfbf3819fb055d4adad0752b9a..664bbb93bd31118eef6558d76dfc823a45447b3c 100644 (file)
--- a/w32/modules.props
+++ b/w32/modules.props
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>\r
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
   <ImportGroup Label="PropertySheets">\r
-    <Import Project="winlibs.props" />\r
+    <Import Project="winlibs.props" Condition=" '$(WinlibsPropsImported)' == '' " />\r
   </ImportGroup>\r
   <PropertyGroup>\r
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>\r
     <OutDir>$(SolutionDir)$(PlatformName)\$(Configuration)\mod\</OutDir>\r
     <IntDir>$(PlatformName)\$(Configuration)\</IntDir>\r
   </PropertyGroup>\r

diff --git a/w32/spidermonkey.props b/w32/spidermonkey.props
index 8300ac91383f21362abbc969a54056a8e438779a..f13aebbca5b22a7e0311f38e344a6e18e8cbf94d 100644 (file)
--- a/w32/spidermonkey.props
+++ b/w32/spidermonkey.props
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>\r
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
   <ImportGroup Label="PropertySheets">\r
-    <Import Project="curl.props" />\r
+    <Import Project="curl.props" Condition=" '$(CurlPropsImported)' == '' "/>\r
   </ImportGroup>\r
   <PropertyGroup>\r
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>\r

diff --git a/w32/winlibs.props b/w32/winlibs.props
index be0cfef212b843fe1a2d446e6b5ade3323b60b6f..2a41eaceddfec0ae0e1b85f0771bb38fd27f1a67 100644 (file)
--- a/w32/winlibs.props
+++ b/w32/winlibs.props
@@ -1,13 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>\r
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
   <ImportGroup Label="PropertySheets">\r
-    <Import Project="curl.props" />\r
+    <Import Project="curl.props" Condition=" '$(CurlPropsImported)' == ''"/>\r
   </ImportGroup>\r
   <PropertyGroup>\r
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>\r
     <_PropertySheetDisplayName>Freeswitch Core Windows Libraries</_PropertySheetDisplayName>\r
   </PropertyGroup>\r
-  <ItemDefinitionGroup>\r
+  <PropertyGroup>\r
+    <WinlibsPropsImported>true</WinlibsPropsImported>\r
+  </PropertyGroup><ItemDefinitionGroup>\r
     <Link>\r
       <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;Ws2_32.lib;Iphlpapi.lib;Winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
     </Link>\r