diff options
| author | marha <marha@users.sourceforge.net> | 2013-07-24 14:25:51 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-07-25 08:25:18 +0200 |
| commit | de54c5b749b3eefb75d420840c889533a58aa342 (patch) | |
| tree | 6502771c9dd5a0d455388734060469b18f2e4011 /xkbcomp | |
| parent | 0606cba5be2dab08f0b4de540d7b278fa6273daf (diff) | |
| download | vcxsrv-de54c5b749b3eefb75d420840c889533a58aa342.tar.gz vcxsrv-de54c5b749b3eefb75d420840c889533a58aa342.tar.bz2 vcxsrv-de54c5b749b3eefb75d420840c889533a58aa342.zip | |
64-bit compilation now compiles and runs
Diffstat (limited to 'xkbcomp')
| -rw-r--r-- | xkbcomp/makefile | 10 |
1 files changed, 1 insertions, 9 deletions
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 $< |