From c619240caca34b085918f948da2aac55d1e76691 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Wed, 24 Nov 2021 09:38:34 -0500
Subject: Fix build system for macOS

---
 tools/msgenc/Makefile   | 9 ++++-----
 tools/nitrogfx/Makefile | 6 +++---
 2 files changed, 7 insertions(+), 8 deletions(-)

(limited to 'tools')

diff --git a/tools/msgenc/Makefile b/tools/msgenc/Makefile
index b39d97cb..ee86181b 100644
--- a/tools/msgenc/Makefile
+++ b/tools/msgenc/Makefile
@@ -8,12 +8,11 @@ endif
 DEPDIR := .deps
 DEPFLAGS = -MT $@ -MMD -MP -MF $(DEPDIR)/$*.d
 
-define SRCS :=
-	msgenc.cpp
-	MessagesConverter.cpp
-	MessagesDecoder.cpp
+SRCS :=                   \
+	msgenc.cpp            \
+	MessagesConverter.cpp \
+	MessagesDecoder.cpp   \
 	MessagesEncoder.cpp
-endef
 
 OBJS := $(SRCS:%.cpp=%.o)
 
diff --git a/tools/nitrogfx/Makefile b/tools/nitrogfx/Makefile
index 37d30b2d..2ed6cf1e 100644
--- a/tools/nitrogfx/Makefile
+++ b/tools/nitrogfx/Makefile
@@ -1,14 +1,14 @@
 CC = gcc
 
-HAVE_LIBPNG := $(shell $(PKGCONFIG) libpng; echo $?)
+HAVE_LIBPNG := $(shell pkg-config libpng; echo $?)
 
 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)
+CFLAGS = -Wall -Wextra -Werror -Wno-sign-compare -std=c11 -O2 -DPNG_SKIP_SETJMP_CHECK $(shell pkg-config --cflags libpng)
 
-LIBS = $(shell $(PKGCONFIG) --libs libpng)
+LIBS = $(shell pkg-config --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
 
-- 
cgit v1.2.3