aboutsummaryrefslogtreecommitdiff
path: root/apps/xclock
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2011-01-19 10:58:44 +0000
committermarha <marha@users.sourceforge.net>2011-01-19 10:58:44 +0000
commit55ad24f775c07bed7ef653d4ead279c8b61fbf20 (patch)
treee5eae61fb3f59ab63739bf7906b4dbad65dde28d /apps/xclock
parent35f18739481b50589e62e5bc6c77956cd590d745 (diff)
downloadvcxsrv-55ad24f775c07bed7ef653d4ead279c8b61fbf20.tar.gz
vcxsrv-55ad24f775c07bed7ef653d4ead279c8b61fbf20.tar.bz2
vcxsrv-55ad24f775c07bed7ef653d4ead279c8b61fbf20.zip
Added makefiles for fontconfig libXft and libXrender
Added libxml2 include files and library Added iconf.h Enabled XRENDER in xclock
Diffstat (limited to 'apps/xclock')
-rw-r--r--apps/xclock/makefile20
1 files changed, 15 insertions, 5 deletions
diff --git a/apps/xclock/makefile b/apps/xclock/makefile
index 35bb8853d..5fc515236 100644
--- a/apps/xclock/makefile
+++ b/apps/xclock/makefile
@@ -1,9 +1,8 @@
WINAPP = xclock
-DEFINES += XT_NO_SM
+DEFINES += XT_NO_SM XRENDER
INCLUDELIBFILES = \
- $(MHMAKECONF)\libXt\src\$(OBJDIR)\libXt.lib \
$(MHMAKECONF)\libX11\src\xkb\$(OBJDIR)\libxkb.lib \
$(MHMAKECONF)\libX11\src\xcms\$(OBJDIR)\libxcms.lib \
$(MHMAKECONF)\libx11\src\xlibi18n\$(OBJDIR)\libi18n.lib \
@@ -18,20 +17,31 @@ INCLUDELIBFILES = \
$(MHMAKECONF)\libxpm\src\$(OBJDIR)\libxpm.lib \
$(MHMAKECONF)\libxau\$(OBJDIR)\libxau.lib \
$(MHMAKECONF)\libXaw\src\$(OBJDIR)\libXaw.lib \
+ $(MHMAKECONF)\libXt\src\$(OBJDIR)\libXt.lib \
$(MHMAKECONF)\libXext\src\$(OBJDIR)\libXext.lib \
$(MHMAKECONF)\libXmu\src\$(OBJDIR)\libXmu.lib \
- $(MHMAKECONF)\libX11\src\$(OBJDIR)\libX11.lib
+ $(MHMAKECONF)\libX11\src\$(OBJDIR)\libX11.lib \
+ $(MHMAKECONF)\libXft\src\$(OBJDIR)\libXft.lib \
+ $(MHMAKECONF)\libXrender\src\$(OBJDIR)\libXrender.lib \
+ $(MHMAKECONF)\fontconfig\src\$(OBJDIR)\libfontconfig.lib \
+ $(MHMAKECONF)\libXfont\src\util\$(OBJDIR)\libutil.lib
+
+INCLUDES += $(MHMAKECONF)\libXft\include $(MHMAKECONF)\freetype\include $(MHMAKECONF)\fontconfig
LIBDIRS=$(dir $(INCLUDELIBFILES))
load_makefile $(LIBDIRS:%$(OBJDIR)\=%makefile MAKESERVER=$(MAKESERVER) DEBUG=$(DEBUG);)
ifeq ($(DEBUG),1)
-LINKLIBS += $(MHMAKECONF)\pthreads\pthreadVC2d.lib
+LINKLIBS += $(MHMAKECONF)\pthreads\pthreadVC2d.lib \
+ $(MHMAKECONF)\freetype\lib\freetype244MT_D.lib
else
-LINKLIBS += $(MHMAKECONF)\pthreads\pthreadVC2.lib
+LINKLIBS += $(MHMAKECONF)\pthreads\pthreadVC2.lib \
+ $(MHMAKECONF)\freetype\lib\freetype244MT.lib
endif
+LINKLIBS += $(MHMAKECONF)\libxml2\lib\libxml2.lib
+
CSRCS = \
Clock.c \
xclock.c