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 | |
| 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
| -rw-r--r-- | mkfontscale/makefile | 4 | ||||
| -rw-r--r-- | xkbcomp/makefile | 10 | ||||
| -rw-r--r-- | xorg-server/makefile | 4 |
3 files changed, 10 insertions, 8 deletions
diff --git a/mkfontscale/makefile b/mkfontscale/makefile index c7f922cb5..5feab92cb 100644 --- a/mkfontscale/makefile +++ b/mkfontscale/makefile @@ -20,9 +20,9 @@ CSRCS = hash.c \ mkfontscale.c ifeq ($(DEBUG),1) -LINKLIBS += $(MHMAKECONF)\freetype\lib\freetype214MT_D.lib +LINKLIBS += $(MHMAKECONF)\freetype\lib\freetype241MT_D.lib else -LINKLIBS += $(MHMAKECONF)\freetype\lib\freetype214MT.lib +LINKLIBS += $(MHMAKECONF)\freetype\lib\freetype241MT.lib endif 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 $< diff --git a/xorg-server/makefile b/xorg-server/makefile index e53b5b2fb..d1215d29c 100644 --- a/xorg-server/makefile +++ b/xorg-server/makefile @@ -59,7 +59,7 @@ TTYAPP=vcxsrv_dbg APP:=$(TTYAPP) LINKLIBS += $(MHMAKECONF)\openssl\out32_d\libeay32.lib \ - $(MHMAKECONF)\freetype\lib\freetype214MT_D.lib \ + $(MHMAKECONF)\freetype\lib\freetype241MT_D.lib \ $(MHMAKECONF)\pthreads\pthreadVC2d.lib $(OBJDIR)\$(TTYAPP).exe: $(LINKLIBS) @@ -69,7 +69,7 @@ WINAPP=vcxsrv APP:=$(WINAPP) LINKLIBS += $(MHMAKECONF)\openssl\out32\libeay32.lib \ - $(MHMAKECONF)\freetype\lib\freetype214MT.lib \ + $(MHMAKECONF)\freetype\lib\freetype241MT.lib \ $(MHMAKECONF)\pthreads\pthreadVC2.lib endif |