Adding zlib 1.2.8 to this project.

This commit is contained in:
/dev/urandom 2016-01-04 21:07:34 +01:00
parent 48356a974c
commit 2618fc506a
No known key found for this signature in database
GPG Key ID: 41322B973E0F295E
3 changed files with 33 additions and 0 deletions

8
.gitmodules vendored Normal file
View File

@ -0,0 +1,8 @@
[submodule "tools/premake/github-package"]
path = tools/premake/github-package
url = https://github.com/mversluys/premake-github-package.git
branch = master
[submodule "deps/zlib"]
path = deps/zlib
url = https://github.com/madler/zlib.git
branch = master

1
deps/zlib vendored Submodule

@ -0,0 +1 @@
Subproject commit 50893291621658f355bc5b4d450a8d06a563053d

View File

@ -56,6 +56,8 @@ workspace "iw4x"
-- VS 2015 toolset only
toolset "msc-140"
configuration "windows"
defines {"_WINDOWS"}
configuration "Release*"
defines { "NDEBUG" }
@ -84,6 +86,10 @@ workspace "iw4x"
pchheader "STDInclude.hpp" -- must be exactly same as used in #include directives
pchsource "src/STDInclude.cpp" -- real path
-- Dependency on zlib
links { "zlib" }
includedirs { "./deps/zlib" }
-- Virtual paths
if not _OPTIONS["no-new-structure"] then
vpaths {
@ -116,4 +122,22 @@ workspace "iw4x"
configuration "Release*"
flags { "FatalCompileWarnings" }
group "External dependencies"
-- zlib
project "zlib"
language "C"
defines { "_CRT_SECURE_NO_DEPRECATE" }
files
{
"./deps/zlib/*.h",
"./deps/zlib/*.c"
}
-- not our code, ignore POSIX usage warnings for now
warnings "Off"
kind "SharedLib"
configuration "*Static"
kind "StaticLib"