Skip to content

Commit 1e5f075

Browse files
committed
Update vendored zlib library
1 parent daf67ff commit 1e5f075

File tree

3 files changed

+8
-4
lines changed

3 files changed

+8
-4
lines changed

.gitmodules

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,7 @@
22
path = libtcod
33
url = https://github.com/libtcod/libtcod
44
shallow = true
5+
[submodule "zlib"]
6+
path = zlib
7+
url = https://github.com/madler/zlib
8+
shallow = true

build_libtcod.py

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ def walk_sources(directory: str) -> Iterator[str]:
152152
".",
153153
"libtcod/src/vendor/",
154154
"libtcod/src/vendor/utf8proc",
155-
"libtcod/src/vendor/zlib/",
155+
"zlib/",
156156
*build_sdl.include_dirs,
157157
]
158158

@@ -169,15 +169,15 @@ def walk_sources(directory: str) -> Iterator[str]:
169169
sources += ["libtcod/src/vendor/stb.c"]
170170
sources += ["libtcod/src/vendor/lodepng.c"]
171171
sources += ["libtcod/src/vendor/utf8proc/utf8proc.c"]
172-
sources += glob.glob("libtcod/src/vendor/zlib/*.c")
172+
sources += glob.glob("zlib/*.c")
173173

174174
if sys.platform == "win32":
175175
libraries += ["User32"]
176176
define_macros.append(("TCODLIB_API", ""))
177177
define_macros.append(("_CRT_SECURE_NO_WARNINGS", None))
178178

179179
if sys.platform in ["win32", "darwin"]:
180-
include_dirs.append("libtcod/src/zlib/")
180+
include_dirs.append("zlib/")
181181

182182

183183
if sys.platform == "darwin":
@@ -199,7 +199,6 @@ def walk_sources(directory: str) -> Iterator[str]:
199199
"-fPIC",
200200
"-Wno-deprecated-declarations",
201201
"-Wno-discarded-qualifiers", # Ignore discarded restrict qualifiers.
202-
"-Wno-error=implicit-function-declaration", # From zlib sources
203202
],
204203
}
205204

zlib

Submodule zlib added at 51b7f2a

0 commit comments

Comments
 (0)