From cde4d617b7e6ee1a16454ca2abf13305446aecc9 Mon Sep 17 00:00:00 2001 From: marha Date: Mon, 13 Jul 2009 18:50:15 +0000 Subject: fonts.src is now compiling --- makefile.after | 6 ++++++ xorg-server/fonts.src/makefile | 1 + xorg-server/include/os.h | 4 ++++ 3 files changed, 11 insertions(+) create mode 100644 xorg-server/fonts.src/makefile diff --git a/makefile.after b/makefile.after index ae4fd1eb4..8c3738c09 100644 --- a/makefile.after +++ b/makefile.after @@ -5,6 +5,12 @@ RESOBJS:=$(RESOURCES:%.rc=$(OBJDIR)$/%.res) MANIFESTFILE:=$(MHMAKECONF)\runtime.manifest +ifdef SUBDIRS +load_makefile $(SUBDIRS:%=%\makefile MAKESERVER=$(MAKESERVER) DEBUG=$(DEBUG);) +all: $(SUBDIRS:%=%\all) +endif + + ### Static library stuff ### ifdef LIBRARY LIBRARY_DIR := $(LIBRARY:%=$(OBJDIR)\%.lib) diff --git a/xorg-server/fonts.src/makefile b/xorg-server/fonts.src/makefile new file mode 100644 index 000000000..9dce92d67 --- /dev/null +++ b/xorg-server/fonts.src/makefile @@ -0,0 +1 @@ +SUBDIRS=font-util 75dpi 100dpi cyrillic encodings misc OTF Speedo TTF Type1 diff --git a/xorg-server/include/os.h b/xorg-server/include/os.h index c67821967..100686f61 100644 --- a/xorg-server/include/os.h +++ b/xorg-server/include/os.h @@ -526,4 +526,8 @@ extern void LogPrintMarkers(void); extern void xorg_backtrace(void); +#ifdef _MSC_VER +#define snprintf _snprintf +#endif + #endif /* OS_H */ -- cgit v1.2.3