ref: e9b8d927ca34e2333a9d17e0e03344faeef658a8
parent: 17f3dd5ae68ab1c71b8a5ea3b7f526d64f196ca9
parent: 3a43c6bad46c1c70a63870828c90f1780d03f794
author: zhilwang <[email protected]>
date: Mon Jun 30 06:08:40 EDT 2014
Merge pull request #1039 from mstorsjo/unify-msvc-project-files Unify some details in MSVC project files
--- a/codec/build/win32/dec/WelsDecPlus.vcproj
+++ b/codec/build/win32/dec/WelsDecPlus.vcproj
@@ -83,9 +83,9 @@
AdditionalLibraryDirectories=".\..\..\..\libs\Release\"
ModuleDefinitionFile="..\..\..\decoder\plus\src\wels_dec_export.def"
GenerateDebugInformation="true"
- ProgramDatabaseFile=".\..\..\..\maps\Release\welsdec.pdb"
+ ProgramDatabaseFile="$(OutDir)\welsdec.pdb"
GenerateMapFile="true"
- MapFileName=".\..\..\..\maps\Release\welsdec.map"
+ MapFileName="$(OutDir)\welsdec.map"
RandomizedBaseAddress="1"
DataExecutionPrevention="2"
ImportLibrary="$(OutDir)\welsdec.lib"
@@ -179,9 +179,9 @@
AdditionalLibraryDirectories=".\..\..\..\libs\Release\"
ModuleDefinitionFile="..\..\..\decoder\plus\src\wels_dec_export.def"
GenerateDebugInformation="true"
- ProgramDatabaseFile=".\..\..\..\maps\Release\welsdec.pdb"
+ ProgramDatabaseFile="$(OutDir)\welsdec.pdb"
GenerateMapFile="true"
- MapFileName=".\..\..\..\maps\Release\welsdec.map"
+ MapFileName="$(OutDir)\welsdec.map"
RandomizedBaseAddress="1"
DataExecutionPrevention="2"
ImportLibrary="$(OutDir)\welsdec.lib"
@@ -274,7 +274,7 @@
AdditionalLibraryDirectories="..\..\..\libs\debug"
ModuleDefinitionFile="..\..\..\decoder\plus\src\wels_dec_export.def"
GenerateDebugInformation="true"
- ProgramDatabaseFile=".\..\..\..\..\bin\win32\Debug/welsdec.pdb"
+ ProgramDatabaseFile="$(OutDir)\welsdec.pdb"
RandomizedBaseAddress="1"
DataExecutionPrevention="2"
ImportLibrary="$(OutDir)\welsdec.lib"
@@ -367,7 +367,7 @@
AdditionalLibraryDirectories="..\..\..\libs\debug"
ModuleDefinitionFile="..\..\..\decoder\plus\src\wels_dec_export.def"
GenerateDebugInformation="true"
- ProgramDatabaseFile=".\..\..\..\..\bin\win32\Debug/welsdec.pdb"
+ ProgramDatabaseFile="$(OutDir)\welsdec.pdb"
RandomizedBaseAddress="1"
DataExecutionPrevention="2"
ImportLibrary="$(OutDir)\welsdec.lib"
--- a/codec/build/win32/enc/WelsEncCore.vcproj
+++ b/codec/build/win32/enc/WelsEncCore.vcproj
@@ -233,7 +233,6 @@
/>
<Tool
Name="VCLibrarianTool"
- AdditionalOptions="/LTCG"
OutputFile="$(OutDir)\welsecore.lib"
/>
<Tool
@@ -314,7 +313,6 @@
/>
<Tool
Name="VCLibrarianTool"
- AdditionalOptions="/LTCG"
OutputFile="$(OutDir)\welsecore.lib"
/>
<Tool
--- a/codec/build/win32/enc/WelsEncPlus.vcproj
+++ b/codec/build/win32/enc/WelsEncPlus.vcproj
@@ -270,7 +270,6 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalOptions="/MAPINFO:exports /LTCG"
AdditionalDependencies="$(OutDir)\welsecore.lib"
OutputFile="$(OutDir)\welsenc.dll"
LinkIncremental="1"
@@ -371,7 +370,6 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalOptions="/MAPINFO:exports /LTCG"
AdditionalDependencies="$(OutDir)\welsecore.lib"
OutputFile="$(OutDir)\welsenc.dll"
LinkIncremental="1"