From 28f43e445db79784c3b4c9c7b972e1a2949360f1 Mon Sep 17 00:00:00 2001 From: Ben Vanik Date: Wed, 30 Dec 2015 20:29:12 -0800 Subject: [PATCH] Adding snappy dependency (to replace zlib) for #505. --- .appveyor.yml | 2 +- .gitmodules | 3 +++ premake5.lua | 1 + third_party/snappy | 1 + third_party/snappy.lua | 22 ++++++++++++++++++++++ 5 files changed, 28 insertions(+), 1 deletion(-) create mode 160000 third_party/snappy create mode 100644 third_party/snappy.lua diff --git a/.appveyor.yml b/.appveyor.yml index e6382452f..c35c0018e 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -69,7 +69,7 @@ build: # MSBuild verbosity level #verbosity: quiet|minimal|normal|detailed - verbosity: detailed + verbosity: minimal # scripts to run before build before_build: diff --git a/.gitmodules b/.gitmodules index 78476b29c..c551d6ee5 100644 --- a/.gitmodules +++ b/.gitmodules @@ -28,3 +28,6 @@ [submodule "third_party/premake-core"] path = third_party/premake-core url = https://github.com/premake/premake-core.git +[submodule "third_party/snappy"] + path = third_party/snappy + url = https://github.com/xenia-project/snappy.git diff --git a/premake5.lua b/premake5.lua index 2ffca50ec..089181d1c 100644 --- a/premake5.lua +++ b/premake5.lua @@ -163,6 +163,7 @@ solution("xenia") include("third_party/glew.lua") include("third_party/imgui.lua") include("third_party/libav.lua") + include("third_party/snappy.lua") include("third_party/spirv-tools.lua") include("third_party/xxhash.lua") include("third_party/zlib.lua") diff --git a/third_party/snappy b/third_party/snappy new file mode 160000 index 000000000..303cd2c64 --- /dev/null +++ b/third_party/snappy @@ -0,0 +1 @@ +Subproject commit 303cd2c64c62c579a8592236f723b611afd3bc15 diff --git a/third_party/snappy.lua b/third_party/snappy.lua new file mode 100644 index 000000000..bf13b762e --- /dev/null +++ b/third_party/snappy.lua @@ -0,0 +1,22 @@ +group("third_party") +project("snappy") + uuid("bb143d61-3fd4-44c2-8b7e-04cc538ba2c7") + kind("StaticLib") + language("C++") + + defines({ + "_LIB", + }) + files({ + "snappy/snappy-internal.h", + "snappy/snappy-sinksource.cc", + "snappy/snappy-sinksource.h", + "snappy/snappy-stubs-internal.cc", + "snappy/snappy-stubs-internal.h", + "snappy/snappy-stubs-public.h", + "snappy/snappy.cc", + "snappy/snappy.h", + }) + + filter("platforms:Windows") + warnings("Off") -- Too many warnings.