build the converters, fix konmodel tool, find X11 on the BSDs

2 files changed, 16 insertions, 5 deletions

diff --git a/Makefile b/Makefile
index 117d973..d8c2745 100644
--- a/Makefile
+++ b/Makefile
@@ -99,7 +99,7 @@ $(OBJDIR)/cgltf.o: tools/cgltf.c $(EXTDIR)/cgltf.h
 
 $(MODELER): tools/konmodel.c $(OBJDIR)/cgltf.o $(KONDIR)/konmodel.c $(KONDIR)/konmodel.h $(KONDIR)/konassets.c $(KONDIR)/konpack.c $(SRCDIR)/impl/konsofren.c
 	@echo "#   link     $@"
-	@$(CC) $(TOOLFLAGS) -DKONMODEL_WRITER -o $@ tools/konmodel.c $(KONDIR)/konmodel.c $(KONDIR)/konassets.c $(KONDIR)/konpack.c $(SRCDIR)/impl/konsofren.c $(OBJDIR)/cgltf.o -lm
+	@$(CC) $(TOOLFLAGS) -DKONSOFREN_3D -DKONMODEL_WRITER -o $@ tools/konmodel.c $(KONDIR)/konmodel.c $(KONDIR)/konassets.c $(KONDIR)/konpack.c $(SRCDIR)/impl/konsofren.c $(OBJDIR)/cgltf.o -lm
 
 # converters. they only read other programs' data, the engine is not linked in
 $(MZSURVEY): tools/mzsurvey.c $(KONDIR)/konjson.h
@@ -107,15 +107,15 @@ $(MZSURVEY): tools/mzsurvey.c $(KONDIR)/konjson.h
 	@echo "#   link     $@"
 	@$(CC) $(TOOLFLAGS) -o $@ tools/mzsurvey.c
 
-$(MZSCRIPT): tools/mzscript.c $(KONDIR)/konjson.h
+$(MZSCRIPT): tools/mzscript.c tools/konscriptc.h $(KONDIR)/konjson.h $(KONDIR)/konscript.c $(KONDIR)/konscript.h
 	@mkdir -p $(OBJDIR)
 	@echo "#   link     $@"
-	@$(CC) $(TOOLFLAGS) -o $@ tools/mzscript.c
+	@$(CC) $(TOOLFLAGS) -Itools -o $@ tools/mzscript.c $(KONDIR)/konscript.c
 
-$(KONS2C): tools/kons2c.c $(KONDIR)/konscript.c $(KONDIR)/konscript.h
+$(KONS2C): tools/kons2c.c tools/konscriptc.h $(KONDIR)/konscript.c $(KONDIR)/konscript.h
 	@mkdir -p $(OBJDIR)
 	@echo "#   link     $@"
-	@$(CC) $(TOOLFLAGS) -o $@ tools/kons2c.c $(KONDIR)/konscript.c
+	@$(CC) $(TOOLFLAGS) -Itools -o $@ tools/kons2c.c $(KONDIR)/konscript.c
 
 pack: $(PACKER)
 	@find $(ASSETDIR) -type f | sort > $(OBJDIR)/assets.lst
diff --git a/build.sh b/build.sh
index 6746c49..6157307 100755
--- a/build.sh
+++ b/build.sh
@@ -44,6 +44,17 @@ case $platform in
 linux|bsd)
 	LDLIBS="-lX11 -lXext -lXrandr -lm"
 	DEFS="-D_POSIX_C_SOURCE=200809L"
+	# the BSDs keep X11 out of the default paths
+	case $(uname -s) in
+	NetBSD) x11=/usr/X11R7 ;;
+	OpenBSD) x11=/usr/X11R6 ;;
+	FreeBSD|DragonFly) x11=/usr/local ;;
+	*) x11= ;;
+	esac
+	if [ -n "$x11" ]; then
+		DEFS="$DEFS -I$x11/include"
+		LDLIBS="-L$x11/lib -Wl,-R$x11/lib $LDLIBS"
+	fi
 	;;
 windows)
 	CC=${CC:-x86_64-w64-mingw32-gcc}