# HG changeset patch
# User Matti Hamalainen <ccr@tnsp.org>
# Date 1463648896 -10800
# Node ID acae5f8ebc67d33cd60305b0e41a1a94db2b80f4
# Parent  197c9ccdb33c2dfaae7f03bc5b22340b0b76638f
Fix build process.

diff -r 197c9ccdb33c -r acae5f8ebc67 Makefile
--- a/Makefile	Wed Jun 03 17:00:07 2015 +0300
+++ b/Makefile	Thu May 19 12:08:16 2016 +0300
@@ -26,6 +26,8 @@
 ZLIB_LDFLAGS ?= `pkg-config --libs zlib`
 
 
+TOOL_LDFLAGS ?= $(SDL_LDFLAGS)
+
 include $(DMLIB)Makefile.gen
 
 
diff -r 197c9ccdb33c -r acae5f8ebc67 Makefile.gen
--- a/Makefile.gen	Wed Jun 03 17:00:07 2015 +0300
+++ b/Makefile.gen	Thu May 19 12:08:16 2016 +0300
@@ -159,6 +159,9 @@
 endif
 endif
 endif
+else
+SDL_TTF_LDFLAGS=
+SDL_TTF_CFLAGS=
 endif
 
 ifeq ($(DM_GFX_8BIT),yes)
diff -r 197c9ccdb33c -r acae5f8ebc67 tools/fontconv.c
--- a/tools/fontconv.c	Wed Jun 03 17:00:07 2015 +0300
+++ b/tools/fontconv.c	Thu May 19 12:08:16 2016 +0300
@@ -27,7 +27,9 @@
     {  1, 'v', "verbose",  "Be more verbose", OPT_NONE },
     {  2, 'o', "output",   "Set output filename", OPT_ARGREQ },
     {  3, 's', "size",     "Set glyph dimensions (-s W:H) for image->font conversion", OPT_ARGREQ },
+#ifdef DM_GFX_TTF_TEXT
     {  4, 'c', "color",    "TTF font rendering color (def: 0xFFFFFF)", OPT_ARGREQ },
+#endif
 };
 
 const int optListN = sizeof(optList) / sizeof(optList[0]);