diff options
| author | XhmikosR <xhmikosr@users.sourceforge.net> | 2010-07-26 20:52:57 +0400 |
|---|---|---|
| committer | XhmikosR <xhmikosr@users.sourceforge.net> | 2010-07-26 20:52:57 +0400 |
| commit | 241a152e50ae61942f91805a60cad92610e323f5 (patch) | |
| tree | 93415cf8fe27cf4e4801528cf351739ff7e25ec1 /src/filters/transform | |
| parent | bf3530abdfaae7e9c0a902bb7f4630ef5b5550ff (diff) | |
changed libavcodec lib name to "libavcodec" for both debug and release configurations; they are in different output directories anyway
git-svn-id: https://mpc-hc.svn.sourceforge.net/svnroot/mpc-hc/trunk@2154 10f7b99b-c216-0410-bff0-8a66a9350fd8
Diffstat (limited to 'src/filters/transform')
4 files changed, 9 insertions, 11 deletions
diff --git a/src/filters/transform/MPCVideoDec/MPCVideoDec.vcproj b/src/filters/transform/MPCVideoDec/MPCVideoDec.vcproj index 922a8d8ba..f6b53253d 100644 --- a/src/filters/transform/MPCVideoDec/MPCVideoDec.vcproj +++ b/src/filters/transform/MPCVideoDec/MPCVideoDec.vcproj @@ -200,7 +200,7 @@ />
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="BaseClasses.lib BaseVideoFilter.lib d3d9.lib DSUtil.lib Filters.lib libavcodec_gcc.lib libgcc.a libmingwex.a Winmm.lib zlib.lib"
+ AdditionalDependencies="BaseClasses.lib BaseVideoFilter.lib d3d9.lib DSUtil.lib Filters.lib libavcodec.lib libgcc.a libmingwex.a Winmm.lib zlib.lib"
OutputFile="$(OutDir)\$(ProjectName).ax"
AdditionalLibraryDirectories="$(SolutionDir)lib;$(SolutionDir)bin\lib\Release_$(PlatformName)"
ModuleDefinitionFile="MPCVideoDec.def"
@@ -275,7 +275,7 @@ />
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="BaseClasses.lib BaseVideoFilter.lib d3d9.lib DSUtil.lib Filters.lib libavcodec_gcc.lib libgcc.a libmingwex.a Winmm.lib zlib.lib"
+ AdditionalDependencies="BaseClasses.lib BaseVideoFilter.lib d3d9.lib DSUtil.lib Filters.lib libavcodec.lib libgcc.a libmingwex.a Winmm.lib zlib.lib"
OutputFile="$(OutDir)\$(ProjectName).ax"
AdditionalLibraryDirectories="$(SolutionDir)lib64;$(SolutionDir)bin\lib\Release_$(PlatformName)"
IgnoreDefaultLibraryNames=""
@@ -471,7 +471,7 @@ Name="VCLibrarianTool"
LinkLibraryDependencies="true"
AdditionalOptions="/IGNORE:4221"
- AdditionalDependencies="libavcodec_gcc.lib libgcc.a libmingwex.a"
+ AdditionalDependencies="libavcodec.lib libgcc.a libmingwex.a"
AdditionalLibraryDirectories="$(OutDir);$(SolutionDir)lib"
/>
<Tool
@@ -534,7 +534,7 @@ Name="VCLibrarianTool"
LinkLibraryDependencies="true"
AdditionalOptions="/IGNORE:4221"
- AdditionalDependencies="libavcodec_gcc.lib libgcc.a libmingwex.a"
+ AdditionalDependencies="libavcodec.lib libgcc.a libmingwex.a"
AdditionalLibraryDirectories="$(OutDir);$(SolutionDir)lib64"
/>
<Tool
diff --git a/src/filters/transform/MPCVideoDec/ffmpeg/Makefile b/src/filters/transform/MPCVideoDec/ffmpeg/Makefile index 77a0f876a..36904f364 100644 --- a/src/filters/transform/MPCVideoDec/ffmpeg/Makefile +++ b/src/filters/transform/MPCVideoDec/ffmpeg/Makefile @@ -190,7 +190,7 @@ else CFLAGS+=-DARCH_X86_32
endif
-SLIB=$(SLIB_DIR)/libavcodec_gcc.lib
+SLIB=$(SLIB_DIR)/libavcodec.lib
DEF=libavcodec_gcc.def
diff --git a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec.vcproj b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec.vcproj index bf2781e71..00e01a424 100644 --- a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec.vcproj +++ b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec.vcproj @@ -209,7 +209,6 @@ />
<Tool
Name="VCLibrarianTool"
- OutputFile="$(OutDir)\libavcodec_gcc.lib"
/>
<Tool
Name="VCALinkTool"
@@ -282,7 +281,6 @@ />
<Tool
Name="VCLibrarianTool"
- OutputFile="$(OutDir)\libavcodec_gcc.lib"
/>
<Tool
Name="VCALinkTool"
diff --git a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec_gcc.vcproj b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec_gcc.vcproj index de31722d1..9df991c4a 100644 --- a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec_gcc.vcproj +++ b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec_gcc.vcproj @@ -30,7 +30,7 @@ BuildCommandLine="gccbuild.bat"
ReBuildCommandLine="gccbuild.bat rebuild"
CleanCommandLine="gccbuild.bat clean"
- Output="$(OutDir)\libavcodec_gcc.lib"
+ Output="$(OutDir)\libavcodec.lib"
PreprocessorDefinitions="WIN32;_DEBUG"
IncludeSearchPath=""
ForcedIncludes=""
@@ -50,7 +50,7 @@ BuildCommandLine="gccbuild64.bat"
ReBuildCommandLine="gccbuild64.bat rebuild"
CleanCommandLine="gccbuild64.bat clean"
- Output="$(OutDir)\libavcodec_gcc.lib"
+ Output="$(OutDir)\libavcodec.lib"
PreprocessorDefinitions="WIN64;_DEBUG"
IncludeSearchPath=""
ForcedIncludes=""
@@ -70,7 +70,7 @@ BuildCommandLine="gccbuild.bat"
ReBuildCommandLine="gccbuild.bat rebuild"
CleanCommandLine="gccbuild.bat clean"
- Output="$(OutDir)\libavcodec_gcc.lib"
+ Output="$(OutDir)\libavcodec.lib"
PreprocessorDefinitions="WIN32;NDEBUG"
IncludeSearchPath=""
ForcedIncludes=""
@@ -90,7 +90,7 @@ BuildCommandLine="gccbuild64.bat"
ReBuildCommandLine="gccbuild64.bat rebuild"
CleanCommandLine="gccbuild64.bat clean"
- Output="$(OutDir)\libavcodec_gcc.lib"
+ Output="$(OutDir)\libavcodec.lib"
PreprocessorDefinitions="WIN64;NDEBUG"
IncludeSearchPath=""
ForcedIncludes=""
|