piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-23 06:09:50 -06:00
Code Issues Packages Projects Releases Wiki Activity

Externals: Add zstd

Browse Source 
I had to rename Source/Common/Compiler.h because the VS build
confuses it with Externals/zstd/lib/common/compiler.h otherwise.
This commit is contained in:
JosJuice
2020-05-03 19:42:12 +02:00
parent 6705fd808b
commit 2137fb7813
71 changed files with 28002 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Core/Common/BitField.h
View File

@ -35,7 +35,7 @@
#include <limits>
#include <type_traits>
#include "Common/Compiler.h"
#include "Common/Inline.h"
/*
* Abstract bitfield class

2
Source/Core/Common/CMakeLists.txt
View File

@ -18,7 +18,6 @@ add_library(common
CommonFuncs.h
CommonPaths.h
CommonTypes.h
Compiler.h
Config/Config.cpp
Config/Config.h
Config/ConfigInfo.cpp
@ -67,6 +66,7 @@ add_library(common
Image.h
IniFile.cpp
IniFile.h
Inline.h
JitRegister.cpp
JitRegister.h
Lazy.h

2
Source/Core/Common/ChunkFile.h
View File

@ -28,8 +28,8 @@
#include "Common/Assert.h"
#include "Common/CommonTypes.h"
#include "Common/Compiler.h"
#include "Common/Flag.h"
#include "Common/Inline.h"
#include "Common/Logging/Log.h"
// XXX: Replace this with std::is_trivially_copyable<T> once we stop using volatile

2
Source/Core/Common/Common.vcxproj
View File

@ -68,7 +68,7 @@
<ClInclude Include="CommonFuncs.h" />
<ClInclude Include="CommonPaths.h" />
<ClInclude Include="CommonTypes.h" />
<ClInclude Include="Compiler.h" />
<ClInclude Include="Inline.h" />
<ClInclude Include="Config\Config.h" />
<ClInclude Include="Config\ConfigInfo.h" />
<ClInclude Include="Config\Enums.h" />

2
Source/Core/Common/Common.vcxproj.filters
View File

@ -37,7 +37,6 @@
<ClInclude Include="CommonFuncs.h" />
<ClInclude Include="CommonPaths.h" />
<ClInclude Include="CommonTypes.h" />
<ClInclude Include="Compiler.h" />
<ClInclude Include="Config\Config.h" />
<ClInclude Include="Config\Enums.h" />
<ClInclude Include="Config\Layer.h" />
@ -287,6 +286,7 @@
<ClInclude Include="DynamicLibrary.h" />
<ClInclude Include="Arm64Emitter.h" />
<ClInclude Include="ArmCommon.h" />
<ClInclude Include="Inline.h" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="CDUtils.cpp" />

2
Source/Core/Common/Crypto/ec.cpp
View File

@ -9,9 +9,9 @@
#include <algorithm>
#include <cstring>
#include "Common/Compiler.h"
#include "Common/Crypto/bn.h"
#include "Common/Crypto/ec.h"
#include "Common/Inline.h"
#include "Common/Random.h"
#include "Common/StringUtil.h"

0
Source/Core/Common/Compiler.h → Source/Core/Common/Inline.h
View File

2
Source/Core/Core/HW/WiimoteEmu/Extension/Extension.cpp
View File

@ -9,7 +9,7 @@
#include <cstring>
#include "Common/CommonTypes.h"
#include "Common/Compiler.h"
#include "Common/Inline.h"
#include "Core/HW/WiimoteEmu/WiimoteEmu.h"
#include "Common/Logging/Log.h"

2
Source/Core/VideoCommon/BPMemory.h
View File

@ -9,7 +9,7 @@
#include "Common/BitField.h"
#include "Common/CommonTypes.h"
#include "Common/Compiler.h"
#include "Common/Inline.h"
enum class EFBCopyFormat;

2
Source/Core/VideoCommon/DataReader.h
View File

@ -7,7 +7,7 @@
#include <cstring>
#include "Common/CommonTypes.h"
#include "Common/Compiler.h"
#include "Common/Inline.h"
#include "Common/Swap.h"
class DataReader

2
Source/Core/VideoCommon/VertexLoaderUtils.h
View File

@ -7,7 +7,7 @@
#include <cstring>
#include "Common/CommonTypes.h"
#include "Common/Compiler.h"
#include "Common/Inline.h"
extern u8* g_video_buffer_read_ptr;
extern u8* g_vertex_manager_write_ptr;

1
Source/VSProps/Base.props
View File

@ -63,6 +63,7 @@
<AdditionalIncludeDirectories>$(ExternalsDir)WIL\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(ExternalsDir)xxhash;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(ExternalsDir)zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(ExternalsDir)zstd\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>FMT_HEADER_ONLY=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>USE_UPNP;USE_USBDK;__LIBUSB__;%(PreprocessorDefinitions)</PreprocessorDefinitions>

11
Source/dolphin-emu.sln
View File

@ -103,6 +103,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bzip2", "..\Externals\bzip2
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "liblzma", "..\Externals\liblzma\liblzma.vcxproj", "{055A775F-B4F5-4970-9240-F6CF7661F37B}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zstd", "..\Externals\zstd\zstd.vcxproj", "{1BEA10F3-80CE-4BC4-9331-5769372CDF99}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|ARM64 = Debug|ARM64
@ -479,6 +481,14 @@ Global
{055A775F-B4F5-4970-9240-F6CF7661F37B}.Release|ARM64.Build.0 = Release|ARM64
{055A775F-B4F5-4970-9240-F6CF7661F37B}.Release|x64.ActiveCfg = Release|x64
{055A775F-B4F5-4970-9240-F6CF7661F37B}.Release|x64.Build.0 = Release|x64
{1BEA10F3-80CE-4BC4-9331-5769372CDF99}.Debug|ARM64.ActiveCfg = Debug|ARM64
{1BEA10F3-80CE-4BC4-9331-5769372CDF99}.Debug|ARM64.Build.0 = Debug|ARM64
{1BEA10F3-80CE-4BC4-9331-5769372CDF99}.Debug|x64.ActiveCfg = Debug|x64
{1BEA10F3-80CE-4BC4-9331-5769372CDF99}.Debug|x64.Build.0 = Debug|x64
{1BEA10F3-80CE-4BC4-9331-5769372CDF99}.Release|ARM64.ActiveCfg = Release|ARM64
{1BEA10F3-80CE-4BC4-9331-5769372CDF99}.Release|ARM64.Build.0 = Release|ARM64
{1BEA10F3-80CE-4BC4-9331-5769372CDF99}.Release|x64.ActiveCfg = Release|x64
{1BEA10F3-80CE-4BC4-9331-5769372CDF99}.Release|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@ -524,6 +534,7 @@ Global
{DEA96CF2-F237-4A1A-B32F-C916769EFB50} = {AAD1BCD6-9804-44A5-A5FC-4782EA00E9D4}
{1D8C51D2-FFA4-418E-B183-9F42B6A6717E} = {87ADDFF9-5768-4DA2-A33B-2477593D6677}
{055A775F-B4F5-4970-9240-F6CF7661F37B} = {87ADDFF9-5768-4DA2-A33B-2477593D6677}
{1BEA10F3-80CE-4BC4-9331-5769372CDF99} = {87ADDFF9-5768-4DA2-A33B-2477593D6677}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {64B0A343-3B94-4522-9C24-6937FE5EFB22}