ref: 470246c20f2cf487f5d7cf691eb5c438bde3ca40
parent: 5397265021c119543a85879749e80747f0dc9092
parent: 71e59fd31ce0a9d269aec41007e7d538fb234617
author: huili2 <[email protected]>
date: Wed Jul 23 09:29:14 EDT 2014
Merge pull request #1195 from mstorsjo/msvc-unify-linker-opts Set MSVC linker debug options consistently in the project files
--- a/codec/build/win32/dec/WelsDecPlus.vcproj
+++ b/codec/build/win32/dec/WelsDecPlus.vcproj
@@ -74,9 +74,6 @@
LinkIncremental="1"
ModuleDefinitionFile="..\..\..\decoder\plus\src\wels_dec_export.def"
GenerateDebugInformation="true"
- ProgramDatabaseFile="$(OutDir)\welsdec.pdb"
- GenerateMapFile="true"
- MapFileName="$(OutDir)\welsdec.map"
RandomizedBaseAddress="1"
DataExecutionPrevention="2"
ImportLibrary="$(OutDir)\welsdec.lib"
@@ -160,9 +157,6 @@
LinkIncremental="1"
ModuleDefinitionFile="..\..\..\decoder\plus\src\wels_dec_export.def"
GenerateDebugInformation="true"
- ProgramDatabaseFile="$(OutDir)\welsdec.pdb"
- GenerateMapFile="true"
- MapFileName="$(OutDir)\welsdec.map"
RandomizedBaseAddress="1"
DataExecutionPrevention="2"
ImportLibrary="$(OutDir)\welsdec.lib"
@@ -244,7 +238,6 @@
LinkIncremental="2"
ModuleDefinitionFile="..\..\..\decoder\plus\src\wels_dec_export.def"
GenerateDebugInformation="true"
- ProgramDatabaseFile="$(OutDir)\welsdec.pdb"
RandomizedBaseAddress="1"
DataExecutionPrevention="2"
ImportLibrary="$(OutDir)\welsdec.lib"
@@ -326,7 +319,6 @@
LinkIncremental="2"
ModuleDefinitionFile="..\..\..\decoder\plus\src\wels_dec_export.def"
GenerateDebugInformation="true"
- ProgramDatabaseFile="$(OutDir)\welsdec.pdb"
RandomizedBaseAddress="1"
DataExecutionPrevention="2"
ImportLibrary="$(OutDir)\welsdec.lib"
--- a/codec/build/win32/dec/decConsole.vcproj
+++ b/codec/build/win32/dec/decConsole.vcproj
@@ -71,8 +71,7 @@
AdditionalDependencies="$(OutDir)\welsdec.lib"
OutputFile="$(OutDir)\decConsole.exe"
LinkIncremental="1"
- ProgramDatabaseFile="$(OutDir)\decConsole.pdb"
- GenerateMapFile="false"
+ GenerateDebugInformation="true"
SubSystem="1"
RandomizedBaseAddress="1"
DataExecutionPrevention="2"
@@ -154,8 +153,7 @@
AdditionalDependencies="$(OutDir)\welsdec.lib"
OutputFile="$(OutDir)\decConsole.exe"
LinkIncremental="1"
- ProgramDatabaseFile="$(OutDir)\decConsole.pdb"
- GenerateMapFile="false"
+ GenerateDebugInformation="true"
SubSystem="1"
RandomizedBaseAddress="1"
DataExecutionPrevention="2"
@@ -237,7 +235,6 @@
OutputFile="$(OutDir)\decConsoled.exe"
LinkIncremental="2"
GenerateDebugInformation="true"
- ProgramDatabaseFile="$(OutDir)\decConsoled.pdb"
SubSystem="1"
RandomizedBaseAddress="1"
DataExecutionPrevention="2"
@@ -319,7 +316,6 @@
OutputFile="$(OutDir)\decConsoled.exe"
LinkIncremental="2"
GenerateDebugInformation="true"
- ProgramDatabaseFile="$(OutDir)\decConsoled.pdb"
SubSystem="1"
RandomizedBaseAddress="1"
DataExecutionPrevention="2"
--- a/codec/build/win32/enc/WelsEncPlus.vcproj
+++ b/codec/build/win32/enc/WelsEncPlus.vcproj
@@ -72,9 +72,6 @@
LinkIncremental="2"
ModuleDefinitionFile="..\..\..\encoder\plus\src\wels_enc_export.def"
GenerateDebugInformation="true"
- ProgramDatabaseFile="$(OutDir)\welsenc.pdb"
- GenerateMapFile="true"
- MapFileName="$(OutDir)\welsenc.map"
RandomizedBaseAddress="1"
DataExecutionPrevention="2"
ImportLibrary="$(OutDir)\welsenc.lib"
@@ -157,9 +154,6 @@
LinkIncremental="2"
ModuleDefinitionFile="..\..\..\encoder\plus\src\wels_enc_export.def"
GenerateDebugInformation="true"
- ProgramDatabaseFile="$(OutDir)\welsenc.pdb"
- GenerateMapFile="true"
- MapFileName="$(OutDir)\welsenc.map"
RandomizedBaseAddress="1"
DataExecutionPrevention="2"
ImportLibrary="$(OutDir)\welsenc.lib"
@@ -245,10 +239,6 @@
LinkIncremental="1"
ModuleDefinitionFile="..\..\..\encoder\plus\src\wels_enc_export.def"
GenerateDebugInformation="true"
- ProgramDatabaseFile="$(OutDir)\welsenc.pdb"
- GenerateMapFile="false"
- MapFileName=""
- MapExports="false"
RandomizedBaseAddress="1"
DataExecutionPrevention="2"
ImportLibrary="$(OutDir)\welsenc.lib"
@@ -334,10 +324,6 @@
LinkIncremental="1"
ModuleDefinitionFile="..\..\..\encoder\plus\src\wels_enc_export.def"
GenerateDebugInformation="true"
- ProgramDatabaseFile="$(OutDir)\welsenc.pdb"
- GenerateMapFile="false"
- MapFileName=""
- MapExports="false"
RandomizedBaseAddress="1"
DataExecutionPrevention="2"
ImportLibrary="$(OutDir)\welsenc.lib"
--- a/codec/build/win32/enc/encConsole.vcproj
+++ b/codec/build/win32/enc/encConsole.vcproj
@@ -71,9 +71,6 @@
OutputFile="$(OutDir)\encConsole.exe"
LinkIncremental="2"
GenerateDebugInformation="true"
- ProgramDatabaseFile="$(OutDir)\encConsole.pdb"
- GenerateMapFile="true"
- MapFileName="$(OutDir)\encConsole.map"
SubSystem="1"
RandomizedBaseAddress="1"
DataExecutionPrevention="2"
@@ -155,9 +152,6 @@
OutputFile="$(OutDir)\encConsole.exe"
LinkIncremental="2"
GenerateDebugInformation="true"
- ProgramDatabaseFile="$(OutDir)\encConsole.pdb"
- GenerateMapFile="true"
- MapFileName="$(OutDir)\encConsole.map"
SubSystem="1"
RandomizedBaseAddress="1"
DataExecutionPrevention="2"
@@ -240,9 +234,6 @@
OutputFile="$(OutDir)\encConsole.exe"
LinkIncremental="1"
GenerateDebugInformation="true"
- ProgramDatabaseFile="$(OutDir)\encConsole.pdb"
- GenerateMapFile="false"
- MapExports="false"
SubSystem="1"
RandomizedBaseAddress="1"
DataExecutionPrevention="2"
@@ -325,9 +316,6 @@
OutputFile="$(OutDir)\encConsole.exe"
LinkIncremental="1"
GenerateDebugInformation="true"
- ProgramDatabaseFile="$(OutDir)\encConsole.pdb"
- GenerateMapFile="false"
- MapExports="false"
SubSystem="1"
RandomizedBaseAddress="1"
DataExecutionPrevention="2"
--- a/codec/processing/build/win32/WelsVP.vcproj
+++ b/codec/processing/build/win32/WelsVP.vcproj
@@ -74,8 +74,6 @@
LinkIncremental="2"
ModuleDefinitionFile="../../src/common/WelsVP.def"
GenerateDebugInformation="true"
- GenerateMapFile="true"
- MapFileName="$(OutDir)\welsvp.map"
SubSystem="2"
TargetMachine="1"
/>
@@ -155,8 +153,6 @@
LinkIncremental="2"
ModuleDefinitionFile="../../src/common/WelsVP.def"
GenerateDebugInformation="true"
- GenerateMapFile="true"
- MapFileName="$(OutDir)\welsvp.map"
SubSystem="2"
TargetMachine="17"
/>
@@ -240,10 +236,7 @@
GenerateManifest="false"
EnableUAC="false"
ModuleDefinitionFile="../../src/common/WelsVP.def"
- GenerateDebugInformation="false"
- GenerateMapFile="false"
- MapFileName=""
- MapExports="false"
+ GenerateDebugInformation="true"
SubSystem="2"
TargetMachine="1"
/>
@@ -328,10 +321,7 @@
GenerateManifest="false"
EnableUAC="false"
ModuleDefinitionFile="../../src/common/WelsVP.def"
- GenerateDebugInformation="false"
- GenerateMapFile="false"
- MapFileName=""
- MapExports="false"
+ GenerateDebugInformation="true"
SubSystem="2"
TargetMachine="17"
/>