Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mpc-hc/mpc-hc.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXhmikosR <xhmikosr@users.sourceforge.net>2010-04-29 20:51:35 +0400
committerXhmikosR <xhmikosr@users.sourceforge.net>2010-04-29 20:51:35 +0400
commitc9a65fbbbdc38f9938e3f13e7f15e9735278d454 (patch)
tree1b9255619ac4fadaa1ae9596b5a370299a387719
parentfdf898dbc49cb9d9fe278cb78570c9f1e3cfa822 (diff)
fixed x64 Debug compilation (again).
Apparently, the Output dirs for libdca were the same for x86 and x64 builds which caused unresolved externals if you first compiled the debug x86 and then the debug x64 build git-svn-id: https://mpc-hc.svn.sourceforge.net/svnroot/mpc-hc/trunk@1824 10f7b99b-c216-0410-bff0-8a66a9350fd8
-rw-r--r--src/filters/parser/NutSplitter/NutSplitter.vcproj1
-rw-r--r--src/filters/transform/MPCVideoDec/ffmpeg/libavcodec.vcproj2
-rw-r--r--src/filters/transform/MpaDecFilter/libdca/vc++/libdca.vcproj22
3 files changed, 11 insertions, 14 deletions
diff --git a/src/filters/parser/NutSplitter/NutSplitter.vcproj b/src/filters/parser/NutSplitter/NutSplitter.vcproj
index 4898f4f74..20a2d782f 100644
--- a/src/filters/parser/NutSplitter/NutSplitter.vcproj
+++ b/src/filters/parser/NutSplitter/NutSplitter.vcproj
@@ -106,6 +106,7 @@
AdditionalOptions="/MP"
AdditionalIncludeDirectories="..\..\..\..\include;..\..\BaseClasses"
PreprocessorDefinitions="_WIN64;_DEBUG;_LIB"
+ UsePrecompiledHeader="0"
DebugInformationFormat="3"
/>
<Tool
diff --git a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec.vcproj b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec.vcproj
index bfa30a524..a9bdfef0d 100644
--- a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec.vcproj
+++ b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec.vcproj
@@ -145,7 +145,7 @@
BrowseInformation="0"
WarningLevel="0"
SuppressStartupBanner="true"
- DebugInformationFormat="4"
+ DebugInformationFormat="3"
CompileAs="0"
DisableSpecificWarnings="4996"
/>
diff --git a/src/filters/transform/MpaDecFilter/libdca/vc++/libdca.vcproj b/src/filters/transform/MpaDecFilter/libdca/vc++/libdca.vcproj
index a5eca4532..4337f3abb 100644
--- a/src/filters/transform/MpaDecFilter/libdca/vc++/libdca.vcproj
+++ b/src/filters/transform/MpaDecFilter/libdca/vc++/libdca.vcproj
@@ -183,8 +183,8 @@
</Configuration>
<Configuration
Name="Debug|Win32"
- OutputDirectory=".\Debug"
- IntermediateDirectory=".\Debug"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(OutDir)"
ConfigurationType="4"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
UseOfMFC="1"
@@ -215,9 +215,9 @@
BasicRuntimeChecks="3"
RuntimeLibrary="1"
PrecompiledHeaderFile=".\Debug/libdca.pch"
- AssemblerListingLocation=".\Debug/"
- ObjectFile=".\Debug/"
- ProgramDataBaseFileName=".\Debug/"
+ AssemblerListingLocation=""
+ ObjectFile="$(IntDir)\"
+ ProgramDataBaseFileName="$(IntDir)\vc90.pdb"
WarningLevel="3"
SuppressStartupBanner="true"
DebugInformationFormat="4"
@@ -291,12 +291,12 @@
BasicRuntimeChecks="3"
RuntimeLibrary="1"
PrecompiledHeaderFile=".\Debug/libdca.pch"
- AssemblerListingLocation=".\Debug/"
- ObjectFile=".\Debug/"
- ProgramDataBaseFileName=".\Debug/"
+ AssemblerListingLocation=""
+ ObjectFile="$(IntDir)\"
+ ProgramDataBaseFileName="$(IntDir)\vc90.pdb"
WarningLevel="3"
SuppressStartupBanner="true"
- DebugInformationFormat="4"
+ DebugInformationFormat="3"
CompileAs="2"
/>
<Tool
@@ -479,10 +479,6 @@
>
</File>
<File
- RelativePath="..\include\dts.h"
- >
- </File>
- <File
RelativePath="..\libdca\tables.h"
>
</File>