aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--fontconfig/config.h4
-rw-r--r--fontconfig/src/makefile2
-rw-r--r--xorg-server/fonts.src/makefile7
3 files changed, 12 insertions, 1 deletions
diff --git a/fontconfig/config.h b/fontconfig/config.h
index eea2ea488..593744bd3 100644
--- a/fontconfig/config.h
+++ b/fontconfig/config.h
@@ -6,4 +6,8 @@
#undef __STDC__
#define FLEXIBLE_ARRAY_MEMBER
#define inline __inline
+#define HAVE_FCNTL_H 1
+#define HAVE__MKTEMP_S 1
+#define FC_CACHEDIR getenv("TEMP")
+#define FC_DEFAULT_FONTS "fonts"
diff --git a/fontconfig/src/makefile b/fontconfig/src/makefile
index 024ca979d..52e4e8fa1 100644
--- a/fontconfig/src/makefile
+++ b/fontconfig/src/makefile
@@ -20,6 +20,7 @@ CSRCS = \
fccache.c \
fccfg.c \
fccharset.c \
+ fccompat.c \
fcdbg.c \
fcdefault.c \
fcdir.c \
@@ -50,7 +51,6 @@ PUBLIC_FILES = \
PUBLIC_FT_FILES = \
..\fontconfig\fcfreetype.h
-DEFINES += FC_CACHEDIR="""getenv(\"""TEMP\""")""" FC_DEFAULT_FONTS="""WINDOWSFONTDIR"""
INCLUDES := .. $(OBJDIR) $(INCLUDES) $(MHMAKECONF)\freetype\include $(MHMAKECONF)\libxml2\include $(MHMAKECONF)\iconv\include
fcalias.h fcaliastail.h: makealias.py $(PUBLIC_FILES)
diff --git a/xorg-server/fonts.src/makefile b/xorg-server/fonts.src/makefile
index 47c583893..3d00b2006 100644
--- a/xorg-server/fonts.src/makefile
+++ b/xorg-server/fonts.src/makefile
@@ -1 +1,8 @@
SUBDIRS=font-util 75dpi 100dpi cyrillic encodings misc OTF Speedo TTF Type1 terminus-font
+
+DESTDIR=$(MHMAKECONF)\xorg-server\fonts
+
+all: $(DESTDIR)\fonts.conf
+
+$(DESTDIR)\fonts.conf: fonts.conf
+ copy $< $@