FS-11122: [Build-System] Fix improper use of debug symbols settings on Windows.

diff --git a/src/mod/asr_tts/mod_pocketsphinx/mod_pocketsphinx.2015.vcxproj b/src/mod/asr_tts/mod_pocketsphinx/mod_pocketsphinx.2015.vcxproj
index 26151933f6ac1e4fa71edcf632f1b8252663fdec..194b959a57afce1c3431673129f4315297e7ec6c 100644 (file)
--- a/src/mod/asr_tts/mod_pocketsphinx/mod_pocketsphinx.2015.vcxproj
+++ b/src/mod/asr_tts/mod_pocketsphinx/mod_pocketsphinx.2015.vcxproj
@@ -89,7 +89,6 @@
     </ClCompile>\r
     <Link>\r
       <AdditionalLibraryDirectories>$(SolutionDir)$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
-      <GenerateDebugInformation>true</GenerateDebugInformation>\r
       <SubSystem>Windows</SubSystem>\r
       <TargetMachine>MachineX86</TargetMachine>\r
       <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>\r
@@ -116,7 +115,6 @@
     </ClCompile>\r
     <Link>\r
       <AdditionalLibraryDirectories>$(SolutionDir)$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
-      <GenerateDebugInformation>true</GenerateDebugInformation>\r
       <SubSystem>Windows</SubSystem>\r
       <TargetMachine>MachineX64</TargetMachine>\r
     </Link>\r
@@ -141,7 +139,6 @@
     </ProjectReference>\r
     <Link>\r
       <AdditionalLibraryDirectories>$(SolutionDir)$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
-      <GenerateDebugInformation>true</GenerateDebugInformation>\r
       <SubSystem>Windows</SubSystem>\r
       <OptimizeReferences>true</OptimizeReferences>\r
       <EnableCOMDATFolding>true</EnableCOMDATFolding>\r
@@ -172,7 +169,6 @@
     </ProjectReference>\r
     <Link>\r
       <AdditionalLibraryDirectories>$(SolutionDir)$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
-      <GenerateDebugInformation>true</GenerateDebugInformation>\r
       <SubSystem>Windows</SubSystem>\r
       <OptimizeReferences>true</OptimizeReferences>\r
       <EnableCOMDATFolding>true</EnableCOMDATFolding>\r

diff --git a/src/mod/endpoints/mod_h323/mod_h323.2015.vcxproj b/src/mod/endpoints/mod_h323/mod_h323.2015.vcxproj
index e889d2c8c5543f6ec5f0b895a1a58d4b658d69be..658934a24d186c688464974dbca9d632c184158c 100644 (file)
--- a/src/mod/endpoints/mod_h323/mod_h323.2015.vcxproj
+++ b/src/mod/endpoints/mod_h323/mod_h323.2015.vcxproj
@@ -115,7 +115,6 @@
     <Link>\r
       <AdditionalDependencies>h323plus.lib;ptlibs.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
       <AdditionalLibraryDirectories>..\..\..\..\..\ptlib\lib;..\..\..\..\..\h323plus\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
-      <GenerateDebugInformation>false</GenerateDebugInformation>\r
       <RandomizedBaseAddress>false</RandomizedBaseAddress>\r
       <DataExecutionPrevention>\r
       </DataExecutionPrevention>\r
@@ -132,7 +131,6 @@
     <Link>\r
       <AdditionalDependencies>h323plus.lib;ptlibs.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
       <AdditionalLibraryDirectories>..\..\..\..\..\ptlib\lib\x64;..\..\..\..\..\h323plus\lib\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
-      <GenerateDebugInformation>false</GenerateDebugInformation>\r
       <RandomizedBaseAddress>false</RandomizedBaseAddress>\r
       <DataExecutionPrevention>\r
       </DataExecutionPrevention>\r

diff --git a/src/mod/formats/mod_shout/mod_shout.2015.vcxproj b/src/mod/formats/mod_shout/mod_shout.2015.vcxproj
index 8478ac139f5c6fb5268832b4e1f10ce91379a608..cef62a1ca83800692c412f4d59e1e256acc4c2d3 100644 (file)
--- a/src/mod/formats/mod_shout/mod_shout.2015.vcxproj
+++ b/src/mod/formats/mod_shout/mod_shout.2015.vcxproj
@@ -86,7 +86,6 @@
     </ClCompile>\r
     <Link>\r
       <IgnoreSpecificDefaultLibraries>LIBCMTD.LIB;LIBCMT.LIB;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>\r
-      <GenerateDebugInformation>true</GenerateDebugInformation>\r
       <TargetMachine>MachineX86</TargetMachine>\r
     </Link>\r
   </ItemDefinitionGroup>\r
@@ -108,7 +107,6 @@
     </ClCompile>\r
     <Link>\r
       <IgnoreSpecificDefaultLibraries>LIBCMTD.LIB;LIBCMT.LIB;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>\r
-      <GenerateDebugInformation>true</GenerateDebugInformation>\r
       <TargetMachine>MachineX64</TargetMachine>\r
     </Link>\r
   </ItemDefinitionGroup>\r
@@ -126,7 +124,6 @@
     </ClCompile>\r
     <Link>\r
       <IgnoreSpecificDefaultLibraries>LIBCMTD.LIB;LIBCMT.LIB;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>\r
-      <GenerateDebugInformation>false</GenerateDebugInformation>\r
       <OptimizeReferences>true</OptimizeReferences>\r
       <EnableCOMDATFolding>true</EnableCOMDATFolding>\r
       <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>\r
@@ -150,7 +147,6 @@
     </ClCompile>\r
     <Link>\r
       <IgnoreSpecificDefaultLibraries>LIBCMTD.LIB;LIBCMT.LIB;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>\r
-      <GenerateDebugInformation>false</GenerateDebugInformation>\r
       <OptimizeReferences>true</OptimizeReferences>\r
       <EnableCOMDATFolding>true</EnableCOMDATFolding>\r
       <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>\r

diff --git a/src/mod/languages/mod_managed/mod_managed.2015.vcxproj b/src/mod/languages/mod_managed/mod_managed.2015.vcxproj
index e208298590fec2cd3dbbf434e98a04e1de8db8c1..8cff1819a733d505ff8397585517b672c22afc52 100644 (file)
--- a/src/mod/languages/mod_managed/mod_managed.2015.vcxproj
+++ b/src/mod/languages/mod_managed/mod_managed.2015.vcxproj
@@ -202,7 +202,6 @@
     <Link>\r
       <ModuleDefinitionFile>\r
       </ModuleDefinitionFile>\r
-      <GenerateDebugInformation>true</GenerateDebugInformation>\r
       <OptimizeReferences>true</OptimizeReferences>\r
       <EnableCOMDATFolding>true</EnableCOMDATFolding>\r
       <AdditionalOptions>/ignore:4248 %(AdditionalOptions)</AdditionalOptions>\r
@@ -223,7 +222,6 @@
     <Link>\r
       <ModuleDefinitionFile>\r
       </ModuleDefinitionFile>\r
-      <GenerateDebugInformation>true</GenerateDebugInformation>\r
       <OptimizeReferences>true</OptimizeReferences>\r
       <EnableCOMDATFolding>true</EnableCOMDATFolding>\r
       <TargetMachine>MachineX64</TargetMachine>\r
@@ -290,7 +288,6 @@
     <Link>\r
       <ModuleDefinitionFile>\r
       </ModuleDefinitionFile>\r
-      <GenerateDebugInformation>true</GenerateDebugInformation>\r
       <OptimizeReferences>true</OptimizeReferences>\r
       <EnableCOMDATFolding>true</EnableCOMDATFolding>\r
       <AdditionalOptions>/ignore:4248 %(AdditionalOptions)</AdditionalOptions>\r
@@ -313,7 +310,6 @@
     <Link>\r
       <ModuleDefinitionFile>\r
       </ModuleDefinitionFile>\r
-      <GenerateDebugInformation>true</GenerateDebugInformation>\r
       <OptimizeReferences>true</OptimizeReferences>\r
       <EnableCOMDATFolding>true</EnableCOMDATFolding>\r
       <TargetMachine>MachineX64</TargetMachine>\r

diff --git a/w32/Console/FreeSwitchConsole.2015.vcxproj b/w32/Console/FreeSwitchConsole.2015.vcxproj
index e6f186e610bfc66fa8ac77ee3d65071747ae98b9..bcf861ab13eaaf3b3a50d4efad8a27c7946e27f7 100644 (file)
--- a/w32/Console/FreeSwitchConsole.2015.vcxproj
+++ b/w32/Console/FreeSwitchConsole.2015.vcxproj
@@ -155,7 +155,7 @@
     </ClCompile>\r
     <Link>\r
       <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
-      <GenerateDebugInformation>true</GenerateDebugInformation>\r
+      <GenerateDebugInformation>false</GenerateDebugInformation>\r
       <SubSystem>Console</SubSystem>\r
       <OptimizeReferences>true</OptimizeReferences>\r
       <EnableCOMDATFolding>true</EnableCOMDATFolding>\r
@@ -183,7 +183,7 @@
     </ClCompile>\r
     <Link>\r
       <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
-      <GenerateDebugInformation>true</GenerateDebugInformation>\r
+      <GenerateDebugInformation>false</GenerateDebugInformation>\r
       <SubSystem>Console</SubSystem>\r
       <OptimizeReferences>true</OptimizeReferences>\r
       <EnableCOMDATFolding>true</EnableCOMDATFolding>\r

diff --git a/w32/Library/FreeSwitchCore.2015.vcxproj b/w32/Library/FreeSwitchCore.2015.vcxproj
index fd636b4a2bae95ab04050dec847066e129ecf06a..901563788d61e9fc0edcee1fe738f6505d8ccabe 100644 (file)
--- a/w32/Library/FreeSwitchCore.2015.vcxproj
+++ b/w32/Library/FreeSwitchCore.2015.vcxproj
@@ -258,7 +258,7 @@ if not exist "$(OutDir)htdocs" xcopy "$(SolutionDir)htdocs\*.*" "$(OutDir)htdocs
     <Link>\r
       <AdditionalDependencies>rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
       <AdditionalLibraryDirectories>$(ProjectDir)..\..\libs\apr\$(OutDir);$(ProjectDir)..\..\libs\sqlite\$(OutDir) DLL;$(ProjectDir)..\..\libs\apr-util\$(OutDir);$(ProjectDir)..\..\libs\apr-iconv\$(OutDir);$(ProjectDir)..\..\libs\libresample\win;$(ProjectDir)..\..\libs\srtp\$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
-      <GenerateDebugInformation>true</GenerateDebugInformation>\r
+      <GenerateDebugInformation>false</GenerateDebugInformation>\r
       <SubSystem>Windows</SubSystem>\r
       <OptimizeReferences>true</OptimizeReferences>\r
       <EnableCOMDATFolding>true</EnableCOMDATFolding>\r
@@ -309,7 +309,7 @@ if not exist "$(OutDir)htdocs" xcopy "$(SolutionDir)htdocs\*.*" "$(OutDir)htdocs
     <Link>\r
       <AdditionalDependencies>rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
       <AdditionalLibraryDirectories>$(ProjectDir)..\..\libs\apr\$(OutDir);$(ProjectDir)..\..\libs\sqlite\$(OutDir) DLL;$(ProjectDir)..\..\libs\apr-util\$(OutDir);$(ProjectDir)..\..\libs\apr-iconv\$(OutDir);$(ProjectDir)..\..\libs\libresample\win;$(ProjectDir)..\..\libs\srtp\$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
-      <GenerateDebugInformation>true</GenerateDebugInformation>\r
+      <GenerateDebugInformation>false</GenerateDebugInformation>\r
       <SubSystem>Windows</SubSystem>\r
       <OptimizeReferences>true</OptimizeReferences>\r
       <EnableCOMDATFolding>true</EnableCOMDATFolding>\r

diff --git a/w32/Setup/Setup.2015.wixproj b/w32/Setup/Setup.2015.wixproj
index 9c3a23349f31c34654f522ca44493d3f9ee54c5e..051c7722c70f28a1dbcd70f138bfc2a251068b86 100644 (file)
--- a/w32/Setup/Setup.2015.wixproj
+++ b/w32/Setup/Setup.2015.wixproj
@@ -135,6 +135,14 @@
       <RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>\r
       <RefTargetDir>INSTALLFOLDER</RefTargetDir>\r
     </ProjectReference>\r
+    <ProjectReference Include="..\..\src\mod\applications\mod_cv\mod_cv.2015.vcxproj">\r
+      <Name>mod_cv</Name>\r
+      <Project>{40c4e2a2-b49b-496c-96d6-c04b890f7f88}</Project>\r
+      <Private>True</Private>\r
+      <DoNotHarvest>True</DoNotHarvest>\r
+      <RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>\r
+      <RefTargetDir>INSTALLFOLDER</RefTargetDir>\r
+    </ProjectReference>\r
     <ProjectReference Include="..\..\src\mod\applications\mod_db\mod_db.2015.vcxproj">\r
       <Name>mod_db</Name>\r
       <Project>{f6a33240-8f29-48bd-98f0-826995911799}</Project>\r

diff --git a/w32/module_debug.props b/w32/module_debug.props
index 85c1d0c1d2506c7a3dbf087edcb3b870f933368e..b25a85165a21cb666b022cb9968f97ed577fb7bb 100644 (file)
--- a/w32/module_debug.props
+++ b/w32/module_debug.props
@@ -17,6 +17,8 @@
       <EnablePREfast>true</EnablePREfast>\r
     </ClCompile>\r
     <Link>\r
+      <GenerateDebugInformation>true</GenerateDebugInformation>\r
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>\r
     </Link>\r
   </ItemDefinitionGroup>\r
 </Project>
\ No newline at end of file

diff --git a/w32/module_release.props b/w32/module_release.props
index 8d9029d303a414731bf297370d9d57fd7b81eed5..81633f09fcd3d9d3b0ad1a32fdbed65038c2569b 100644 (file)
--- a/w32/module_release.props
+++ b/w32/module_release.props
@@ -18,6 +18,7 @@
       <OptimizeReferences>true</OptimizeReferences>\r
       <EnableCOMDATFolding>true</EnableCOMDATFolding>\r
       <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>\r
+      <GenerateDebugInformation>false</GenerateDebugInformation>\r
     </Link>\r
   </ItemDefinitionGroup>\r
 </Project>
\ No newline at end of file

diff --git a/w32/modules.props b/w32/modules.props
index 664bbb93bd31118eef6558d76dfc823a45447b3c..80aa16563a9583786357c0198d87b89b9eb91b51 100644 (file)
--- a/w32/modules.props
+++ b/w32/modules.props
@@ -15,8 +15,6 @@
     </ClCompile>\r
     <Link>\r
       <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>\r
-      <GenerateDebugInformation>true</GenerateDebugInformation>\r
-      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>\r
     </Link>\r
   </ItemDefinitionGroup>\r
 </Project>
\ No newline at end of file