diff options
| author | marha <marha@users.sourceforge.net> | 2009-07-13 18:50:15 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2009-07-13 18:50:15 +0000 |
| commit | cde4d617b7e6ee1a16454ca2abf13305446aecc9 (patch) | |
| tree | 622607c10d1ba0aaf62e4fccbb371cabfb514e87 | |
| parent | 02096cdb6a690bce3fdbb3fef0230a1f6656001f (diff) | |
| download | vcxsrv-cde4d617b7e6ee1a16454ca2abf13305446aecc9.tar.gz vcxsrv-cde4d617b7e6ee1a16454ca2abf13305446aecc9.tar.bz2 vcxsrv-cde4d617b7e6ee1a16454ca2abf13305446aecc9.zip | |
fonts.src is now compiling
| -rw-r--r-- | makefile.after | 6 | ||||
| -rw-r--r-- | xorg-server/fonts.src/makefile | 1 | ||||
| -rw-r--r-- | xorg-server/include/os.h | 4 |
3 files changed, 11 insertions, 0 deletions
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 */ |