diff options
| author | marha <marha@users.sourceforge.net> | 2010-08-06 12:36:02 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-08-06 12:36:02 +0000 |
| commit | 85e6939883df4d5e3d414c4c5b2e81a92bf5f030 (patch) | |
| tree | 08b5e46e98839e22f5a120880d7652fd986e586d /xkbcomp/makefile | |
| parent | 20c58fa4c54b15188437c34985d03a74c3a0a7d5 (diff) | |
| download | vcxsrv-85e6939883df4d5e3d414c4c5b2e81a92bf5f030.tar.gz vcxsrv-85e6939883df4d5e3d414c4c5b2e81a92bf5f030.tar.bz2 vcxsrv-85e6939883df4d5e3d414c4c5b2e81a92bf5f030.zip | |
xkbcomp: avoid needless recompilation when switching between debug and release
wrong library name for freetype library
Diffstat (limited to 'xkbcomp/makefile')
| -rw-r--r-- | xkbcomp/makefile | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/xkbcomp/makefile b/xkbcomp/makefile index 9f27c83d9..79dc293d2 100644 --- a/xkbcomp/makefile +++ b/xkbcomp/makefile @@ -23,6 +23,8 @@ endif DEFINES += DFLT_XKB_CONFIG_ROOT="\".\"" +INCLUDES += $(OBJDIR) + CSRCS = action.c \ alias.c \ compat.c \ @@ -46,12 +48,12 @@ CSRCS = action.c \ LINKLIBS += $(MHMAKECONF)\openssl\out32\libeay32.lib ifeq ($(DEBUG),1) -LINKLIBS += $(MHMAKECONF)\freetype\lib\freetype214MT_D.lib \ +LINKLIBS += $(MHMAKECONF)\freetype\lib\freetype241MT_D.lib \ $(MHMAKECONF)\pthreads\pthreadVC2d.lib else -LINKLIBS += $(MHMAKECONF)\freetype\lib\freetype214MT.lib \ +LINKLIBS += $(MHMAKECONF)\freetype\lib\freetype241MT.lib \ $(MHMAKECONF)\pthreads\pthreadVC2.lib endif -xkbparse.c xkbparse.h: xkbparse.y - bison -d -oxkbparse.c $< +$(OBJDIR)\xkbparse.c $(OBJDIR)\xkbparse.h: xkbparse.y + bison -d -o$(OBJDIR)\xkbparse.c $< |