From 83b63fe1c7add9db7fe525b4b30353a5128e84ff Mon Sep 17 00:00:00 2001
From: Rob Pearce <rob@nethack.net>
Date: Thu, 11 May 2006 04:35:30 +0000
Subject: [PATCH] - Windows makefile now uses sdl-config - Fix bug with font
 file location - now searches $NETMAPRDIR for it once more.

---
 Makefile.windows | 2 +-
 netmapr.c        | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Makefile.windows b/Makefile.windows
index a5b4133..4fe6098 100644
--- a/Makefile.windows
+++ b/Makefile.windows
@@ -1,5 +1,5 @@
 netmapr:	netmapr.c constants.h netmapr.h Makefile
-	gcc -mwindows -mno-cygwin -Wall -onetmapr.exe -O2 -g netmapr.c windows_files/attachicon.res -I/usr/local/include -lmingw32 -L/usr/local/lib -lSDLmain -lSDL -lSDL_ttf 
+	gcc -mwindows -mno-cygwin -Wall -onetmapr.exe -O2 -g netmapr.c windows_files/attachicon.res `sdl-config --cflags --libs` -I/usr/local/include -lmingw32 -L/usr/local/lib -lSDLmain -lSDL -lSDL_ttf 
 
 convert:	convert.c convert.h Makefile
 	gcc -Wall -g convert.c -I/usr/local/include -oconvert -lmingw32 -L/usr/local/lib -lSDLmain -lSDL
diff --git a/netmapr.c b/netmapr.c
index cd31aef..1edf147 100644
--- a/netmapr.c
+++ b/netmapr.c
@@ -6109,10 +6109,10 @@ int initgraphics(void) {
 			sprintf(file, "/usr/local/share/netmapr/verdana.ttf");
 			font[i] = TTF_OpenFont(file,i);
 		}
-		//if (!font[i]) {
-		//	sprintf(file, "%s/verdana.ttf",progdir);
-		//	font[i] = TTF_OpenFont(file,i);
-		//}
+		if (!font[i]) {
+			sprintf(file, "%s/verdana.ttf",progdir);
+			font[i] = TTF_OpenFont(file,i);
+		}
 		if (!font[i]) {
 			printf("Error opening font: %s\n", TTF_GetError());
 			exit(1);