fabi/Xenia-Canary
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

New minimal libav build and fixing some link warnings.

Browse Source
This commit is contained in:
Ben Vanik
2015-06-20 17:26:13 -07:00
parent fb591cbadb
commit a0ec10fbea
9 changed files with 19 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
build/Xenia.Cpp.x64.Checked.props
View File

@@ -14,8 +14,9 @@
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<BufferSecurityCheck>true</BufferSecurityCheck>
</ClCompile>
<Lib />
<Lib>
<AdditionalLibraryDirectories>$(SolutionDir)third_party\libav-bin\lib\Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalLibraryDirectories>$(SolutionDir)third_party\libav-xma-bin\lib\Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
</Lib>
</ItemDefinitionGroup>
<ItemGroup />

9
build/Xenia.Cpp.x64.Common.props
View File

@@ -9,7 +9,7 @@
<ItemDefinitionGroup>
<ClCompile>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<AdditionalIncludeDirectories>$(SolutionDir)third_party\flatbuffers\include;$(SolutionDir)third_party\gflags\src;$(SolutionDir)third_party;$(SolutionDir)src;$(SolutionDir)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(SolutionDir)third_party\flatbuffers\include\;$(SolutionDir)third_party\gflags\src\;$(SolutionDir)src\;$(SolutionDir)third_party;$(SolutionDir)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>GLEW_STATIC=1;GLEW_MX=1;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_UNICODE;UNICODE;WIN32;_WIN64=1;_AMD64=1;MICROPROFILE_MAX_THREADS=128;CAPSTONE_X86_ATT_DISABLE;CAPSTONE_DIET_NO;CAPSTONE_X86_REDUCE_NO;CAPSTONE_HAS_X86;CAPSTONE_USE_SYS_DYN_MEM;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<WarningLevel>Level4</WarningLevel>
<TreatWarningAsError>true</TreatWarningAsError>
@@ -17,11 +17,14 @@
<RuntimeTypeInfo>false</RuntimeTypeInfo>
</ClCompile>
<Link>
<AdditionalLibraryDirectories>$(SolutionDir)build\bin\$(Configuration)</AdditionalLibraryDirectories>
<AdditionalLibraryDirectories>$(SolutionDir)build\bin\$(Configuration)\</AdditionalLibraryDirectories>
<AdditionalDependencies>ntdll.lib;wsock32.lib;ws2_32.lib;xinput.lib;xaudio2.lib;glu32.lib;opengl32.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalOptions>/ignore:4006 /ignore:4221 %(AdditionalOptions)</AdditionalOptions>
<IgnoreSpecificDefaultLibraries>MSVCRTD</IgnoreSpecificDefaultLibraries>
</Link>
<Lib>
<AdditionalLibraryDirectories>$(SolutionDir)build\bin\$(Configuration)\;$(SolutionDir)third_party\libav-bin\lib\$(Configuration)</AdditionalLibraryDirectories>
<AdditionalLibraryDirectories>$(SolutionDir)build\bin\$(Configuration)\;$(SolutionDir)third_party\libav-xma-bin\lib\$(Configuration)</AdditionalLibraryDirectories>
<AdditionalOptions>/ignore:4006 /ignore:4221 %(AdditionalOptions)</AdditionalOptions>
</Lib>
</ItemDefinitionGroup>
<ItemGroup />

4
build/Xenia.Cpp.x64.Debug.props
View File

@@ -15,7 +15,9 @@
<GenerateDebugInformation>Debug</GenerateDebugInformation>
</Link>
<Lib />
<Lib />
<Lib>
<AdditionalLibraryDirectories>$(SolutionDir)third_party\libav-xma-bin\lib\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
</Lib>
</ItemDefinitionGroup>
<ItemGroup />
</Project>

1
build/Xenia.Cpp.x64.Release.props
View File

@@ -14,7 +14,6 @@
<ControlFlowGuard>false</ControlFlowGuard>
<EnableEnhancedInstructionSet>AdvancedVectorExtensions</EnableEnhancedInstructionSet>
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<StringPooling>true</StringPooling>
</ClCompile>
<Link>