diff options
| author | marha <marha@users.sourceforge.net> | 2010-08-20 08:28:36 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-08-20 08:28:36 +0000 |
| commit | f5d6fd32902e742cc62622b1abc8826dd7c03c32 (patch) | |
| tree | 96c33069543f425f5f70045e24b549a5783c73d1 /xkbcomp | |
| parent | 3799f1085abb02c5721f4c33f42c063edb68029d (diff) | |
| parent | 00666832a756014eef48c4f5bd8484cc1299bdf0 (diff) | |
| download | vcxsrv-f5d6fd32902e742cc62622b1abc8826dd7c03c32.tar.gz vcxsrv-f5d6fd32902e742cc62622b1abc8826dd7c03c32.tar.bz2 vcxsrv-f5d6fd32902e742cc62622b1abc8826dd7c03c32.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'xkbcomp')
| -rw-r--r-- | xkbcomp/makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/xkbcomp/makefile b/xkbcomp/makefile index 79dc293d2..6625ac5ba 100644 --- a/xkbcomp/makefile +++ b/xkbcomp/makefile @@ -48,10 +48,10 @@ CSRCS = action.c \ LINKLIBS += $(MHMAKECONF)\openssl\out32\libeay32.lib ifeq ($(DEBUG),1) -LINKLIBS += $(MHMAKECONF)\freetype\lib\freetype241MT_D.lib \ +LINKLIBS += $(MHMAKECONF)\freetype\lib\freetype242MT_D.lib \ $(MHMAKECONF)\pthreads\pthreadVC2d.lib else -LINKLIBS += $(MHMAKECONF)\freetype\lib\freetype241MT.lib \ +LINKLIBS += $(MHMAKECONF)\freetype\lib\freetype242MT.lib \ $(MHMAKECONF)\pthreads\pthreadVC2.lib endif |