Skip to content

Commit db0c729

Browse files
committed
squash: libpng ci deps
Android build deps are handled in the gradle build, we only need libpng here to get ci to generate tilesheets.
1 parent aaf5668 commit db0c729

1 file changed

Lines changed: 4 additions & 2 deletions

File tree

.github/workflows/deps.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ def _packages_to_install(args: argparse.Namespace) -> Set[str]:
6060
"ccache",
6161
"advancecomp", # used to compress release zips and png sprite sheets
6262
}
63-
if "TILES" in args.build_opts or "WEBTILES" in args.build_opts or "ANDROID" in args.build_opts:
63+
if "TILES" in args.build_opts or "WEBTILES" in args.build_opts:
6464
packages.update(
6565
[
6666
"libsdl2-image-dev",
@@ -71,14 +71,16 @@ def _packages_to_install(args: argparse.Namespace) -> Set[str]:
7171
"fonts-dejavu",
7272
]
7373
)
74+
if "ANDROID" in args.build_opts:
75+
packages.add("libpng-dev")
7476
if "FULLDEBUG" in args.debug_opts:
7577
packages.add("gdb")
7678
if args.coverage:
7779
packages.add("lcov")
7880
if args.crosscompile:
7981
packages.add("mingw-w64")
8082
packages.add("nsis") # makensis used to build Windows installer
81-
# native libpng used to generate tilesheets during the build
83+
# ci needs non-crosscompiled libpng to generate tilesheets
8284
packages.add("libpng-dev")
8385
if args.compiler == "clang":
8486
# dependencies for llvm.sh

0 commit comments

Comments
 (0)