From de54c5b749b3eefb75d420840c889533a58aa342 Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Wed, 24 Jul 2013 14:25:51 +0200
Subject: 64-bit compilation now compiles and runs

---
 xkbcomp/makefile | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

(limited to 'xkbcomp')

diff --git a/xkbcomp/makefile b/xkbcomp/makefile
index f495b9c03..a7d731352 100644
--- a/xkbcomp/makefile
+++ b/xkbcomp/makefile
@@ -37,15 +37,7 @@ CSRCS = action.c \
         xkbpath.c \
         xkbscan.c
 
-LINKLIBS += $(MHMAKECONF)\openssl\out32\libeay32.lib
-
-ifeq ($(DEBUG),1)
-LINKLIBS += $(MHMAKECONF)\freetype\lib\freetype2501MT_D.lib \
-            $(MHMAKECONF)\pthreads\pthreadVC2d.lib
-else
-LINKLIBS += $(MHMAKECONF)\freetype\lib\freetype2501MT.lib \
-            $(MHMAKECONF)\pthreads\pthreadVC2.lib
-endif
+LINKLIBS += $(PTHREADLIB) $(FREETYPELIB) $(OPENSSLLIB)
 
 $(OBJDIR)\xkbparse.c $(OBJDIR)\xkbparse.h: xkbparse.y
 	bison.bat -d -o$(OBJDIR)\xkbparse.c $<
-- 
cgit v1.2.3