summaryrefslogtreecommitdiff
path: root/tools/nitrogfx
diff options
context:
space:
mode:
authorPikalaxALT <pikalaxalt@gmail.com>2021-11-11 15:21:59 -0500
committerPikalaxALT <pikalaxalt@gmail.com>2021-11-11 15:21:59 -0500
commit7af4107235e6c178d5740782fe510d2df1c825b1 (patch)
treed548d9c443140e77e4e158171055d08ffb77e30b /tools/nitrogfx
parent94edcc1b5496a41478e10bd6aa4ff84f5c2ee5aa (diff)
Fix Makefile issues with OSX 11.6
Diffstat (limited to 'tools/nitrogfx')
-rw-r--r--tools/nitrogfx/Makefile10
-rw-r--r--tools/nitrogfx/main.c1
2 files changed, 9 insertions, 2 deletions
diff --git a/tools/nitrogfx/Makefile b/tools/nitrogfx/Makefile
index 16b2632d..37d30b2d 100644
--- a/tools/nitrogfx/Makefile
+++ b/tools/nitrogfx/Makefile
@@ -1,8 +1,14 @@
CC = gcc
-CFLAGS = -Wall -Wextra -Werror -Wno-sign-compare -std=c11 -O2 -DPNG_SKIP_SETJMP_CHECK $(shell pkg-config --cflags libpng)
+HAVE_LIBPNG := $(shell $(PKGCONFIG) libpng; echo $?)
-LIBS = $(shell pkg-config --libs libpng)
+ifeq ($(HAVE_LIBPNG),1)
+$(error No package 'libpng' found)
+endif
+
+CFLAGS = -Wall -Wextra -Werror -Wno-sign-compare -std=c11 -O2 -DPNG_SKIP_SETJMP_CHECK $(shell $(PKGCONFIG) --cflags libpng)
+
+LIBS = $(shell $(PKGCONFIG) --libs libpng)
SRCS = main.c convert_png.c gfx.c jasc_pal.c lz.c rl.c util.c font.c huff.c json.c cJSON.c
diff --git a/tools/nitrogfx/main.c b/tools/nitrogfx/main.c
index b52aa48b..5561e44e 100644
--- a/tools/nitrogfx/main.c
+++ b/tools/nitrogfx/main.c
@@ -362,6 +362,7 @@ void HandlePngToNtrCommand(char *inputPath, char *outputPath, int argc, char **a
options.bitDepth = 4;
options.metatileWidth = 1;
options.metatileHeight = 1;
+ options.wrongSize = false;
options.clobberSize = false;
options.byteOrder = true;
options.version101 = false;