Build muxer and parser into a single library.
Makefile: - Add a new target that makes a single libwebm.a instead of building separate muxer and parser libraries. - Update sample targets accordingly. Visual Studio: - Use a single project for muxing and parsing, and build a single library name libwebm.lib. - Update code generation settings (DLL -> static runtimes). - Use C7 debug information format (instead of PDB) - Disable minimal rebuild (C7 use causes warning otherwise). Change-Id: Ie221d4ee02c93f98f2521757c08b75ecbf75f54f
This commit is contained in:
@@ -45,7 +45,7 @@
|
||||
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
|
||||
MinimalRebuild="true"
|
||||
BasicRuntimeChecks="3"
|
||||
RuntimeLibrary="3"
|
||||
RuntimeLibrary="1"
|
||||
UsePrecompiledHeader="0"
|
||||
WarningLevel="4"
|
||||
DebugInformationFormat="4"
|
||||
@@ -61,7 +61,7 @@
|
||||
/>
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalDependencies="..\Debug\mkvparser.lib ..\Debug\mkvmuxer.lib"
|
||||
AdditionalDependencies="..\Debug\libwebm.lib"
|
||||
LinkIncremental="2"
|
||||
GenerateDebugInformation="true"
|
||||
SubSystem="1"
|
||||
@@ -118,7 +118,7 @@
|
||||
EnableIntrinsicFunctions="true"
|
||||
AdditionalIncludeDirectories="../"
|
||||
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
|
||||
RuntimeLibrary="2"
|
||||
RuntimeLibrary="0"
|
||||
EnableFunctionLevelLinking="true"
|
||||
UsePrecompiledHeader="0"
|
||||
WarningLevel="4"
|
||||
@@ -135,7 +135,7 @@
|
||||
/>
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalDependencies="..\Release\mkvparser.lib ..\Release\mkvmuxer.lib"
|
||||
AdditionalDependencies="..\Release\libwebm.lib"
|
||||
LinkIncremental="1"
|
||||
GenerateDebugInformation="true"
|
||||
SubSystem="1"
|
||||
|
||||
Reference in New Issue
Block a user