vcxsrv compiles now. Still run-time errors.

1 files changed, 83 insertions, 74 deletions

diff --git a/xorg-server/fonts.src/misc/makefile b/xorg-server/fonts.src/misc/makefile
index 62ba64b7f..8d274444d 100644
--- a/xorg-server/fonts.src/misc/makefile
+++ b/xorg-server/fonts.src/misc/makefile
@@ -2,6 +2,8 @@ ifeq ($(MAKESERVER),1)
 $(error Please do not specify MAKESERVER=1)
 endif
 
+INC_BDF_RULES=1
+
 DESTDIR=$(MHMAKECONF)\xorg-server\fonts\misc
 $(DESTDIR):
 	if not isdir "$(DESTDIR)" mkdir /s "$(DESTDIR)"
@@ -151,53 +153,36 @@ FONT_FILES = $(BDF2UCS_FONT_FILES) $(EXTRA_FONT_FILES)
 BDF_FILES = $(FONT_FILES:%=%.bdf)
 PCF_FILES = $(FONT_FILES:%=$(DESTDIR)\%.pcf.gz)
 
-ISO8859_1_BDF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-1.bdf)
 ISO8859_1_PCF_FILES = $(BDF2UCS_FONT_FILES:%=$(DESTDIR)\%-ISO8859-1.pcf.gz)
 
-ISO8859_2_BDF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-2.bdf)
 ISO8859_2_PCF_FILES = $(BDF2UCS_FONT_FILES:%=$(DESTDIR)\%-ISO8859-2.pcf.gz)
 
-ISO8859_3_BDF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-3.bdf)
 ISO8859_3_PCF_FILES = $(BDF2UCS_FONT_FILES:%=$(DESTDIR)\%-ISO8859-3.pcf.gz)
 
-ISO8859_4_BDF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-4.bdf)
 ISO8859_4_PCF_FILES = $(BDF2UCS_FONT_FILES:%=$(DESTDIR)\%-ISO8859-4.pcf.gz)
 
-ISO8859_5_BDF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-5.bdf)
 ISO8859_5_PCF_FILES = $(BDF2UCS_FONT_FILES:%=$(DESTDIR)\%-ISO8859-5.pcf.gz)
 
-ISO8859_7_BDF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-7.bdf)
 ISO8859_7_PCF_FILES = $(BDF2UCS_FONT_FILES:%=$(DESTDIR)\%-ISO8859-7.pcf.gz)
 
-ISO8859_8_BDF_FILES = $(BDF2UCS_8_FONT_FILES:%=%-ISO8859-8.bdf)
 ISO8859_8_PCF_FILES = $(BDF2UCS_8_FONT_FILES:%=$(DESTDIR)\%-ISO8859-8.pcf.gz)
 
-ISO8859_9_BDF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-9.bdf)
 ISO8859_9_PCF_FILES = $(BDF2UCS_FONT_FILES:%=$(DESTDIR)\%-ISO8859-9.pcf.gz)
 
-ISO8859_10_BDF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-10.bdf)
 ISO8859_10_PCF_FILES = $(BDF2UCS_FONT_FILES:%=$(DESTDIR)\%-ISO8859-10.pcf.gz)
 
-ISO8859_11_BDF_FILES = $(BDF2UCS_11_FONT_FILES:%=%-ISO8859-11.bdf)
 ISO8859_11_PCF_FILES = $(BDF2UCS_11_FONT_FILES:%=$(DESTDIR)\%-ISO8859-11.pcf.gz)
 
-ISO8859_13_BDF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-13.bdf)
 ISO8859_13_PCF_FILES = $(BDF2UCS_FONT_FILES:%=$(DESTDIR)\%-ISO8859-13.pcf.gz)
 
-ISO8859_14_BDF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-14.bdf)
 ISO8859_14_PCF_FILES = $(BDF2UCS_FONT_FILES:%=$(DESTDIR)\%-ISO8859-14.pcf.gz)
 
-ISO8859_15_BDF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-15.bdf)
 ISO8859_15_PCF_FILES = $(BDF2UCS_FONT_FILES:%=$(DESTDIR)\%-ISO8859-15.pcf.gz)
 
-
-ISO8859_16_BDF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-16.bdf)
 ISO8859_16_PCF_FILES = $(BDF2UCS_FONT_FILES:%=$(DESTDIR)\%-ISO8859-16.pcf.gz)
 
-KOI8_R_BDF_FILES = $(BDF2UCS_KOI8_FONT_FILES:%=%-KOI8-R.bdf)
 KOI8_R_PCF_FILES = $(BDF2UCS_KOI8_FONT_FILES:%=$(DESTDIR)\%-KOI8-R.pcf.gz)
 
-JISX0201_BDF_FILES = $(BDF2UCS_JISX0201_FONT_FILES:%=%-JISX0201.1976-0.bdf)
 JISX0201_PCF_FILES = $(BDF2UCS_JISX0201_FONT_FILES:%=$(DESTDIR)\%-JISX0201.1976-0.pcf.gz)
 
 UTIL_DIR = ..\font-util
@@ -205,77 +190,117 @@ UCS2ANY = $(UTIL_DIR)\$(OBJDIR)\ucs2any.exe
 
 load_makefile $(UTIL_DIR)\makefile MAKESERVER=0 DEBUG=$(DEBUG)
 
-#%t.bdf: %.bdf
-#	@rm -f $@
-#	perl $(BDFTRUNCATE) 0x3200 < $< > $@
-
-%-ISO8859-1.bdf: %.bdf
-	@del -e $@
+$(DESTDIR)\%-ISO8859-1.pcf.gz: %.bdf
+	@del -e $(<:%.bdf=%-ISO8859-1.bdf)
 	$(UCS2ANY) $< $(UTIL_DIR)\map-ISO8859-1 ISO8859-1
-
-%-ISO8859-2.bdf: %.bdf
 	@del -e $@
-	$(UCS2ANY) $< $(UTIL_DIR)\map-ISO8859-2 ISO8859-2
+	$(BDFTOPCF) -t $(<:%.bdf=%-ISO8859-1.bdf) | gzip > $@
+	@del $(<:%.bdf=%-ISO8859-1.bdf)
 
-%-ISO8859-3.bdf: %.bdf
+$(DESTDIR)\%-ISO8859-2.pcf.gz: %.bdf
+	@del -e $(<:%.bdf=%-ISO8859-2.bdf)
+	$(UCS2ANY) $< $(UTIL_DIR)\map-ISO8859-2 ISO8859-2
 	@del -e $@
-	$(UCS2ANY) $< $(UTIL_DIR)\map-ISO8859-3 ISO8859-3
+	$(BDFTOPCF) -t $(<:%.bdf=%-ISO8859-2.bdf) | gzip > $@
+	@del $(<:%.bdf=%-ISO8859-2.bdf)
 
-%-ISO8859-4.bdf: %.bdf
+$(DESTDIR)\%-ISO8859-3.pcf.gz: %.bdf
+	@del -e $(<:%.bdf=%-ISO8859-3.bdf)
+	$(UCS2ANY) $< $(UTIL_DIR)\map-ISO8859-3 ISO8859-3
 	@del -e $@
-	$(UCS2ANY) $< $(UTIL_DIR)\map-ISO8859-4 ISO8859-4
+	$(BDFTOPCF) -t $(<:%.bdf=%-ISO8859-3.bdf) | gzip > $@
+	@del $(<:%.bdf=%-ISO8859-3.bdf)
 
-%-ISO8859-5.bdf: %.bdf
+$(DESTDIR)\%-ISO8859-4.pcf.gz: %.bdf
+	@del -e $(<:%.bdf=%-ISO8859-4.bdf)
+	$(UCS2ANY) $< $(UTIL_DIR)\map-ISO8859-4 ISO8859-4
 	@del -e $@
-	$(UCS2ANY) $< $(UTIL_DIR)\map-ISO8859-5 ISO8859-5
+	$(BDFTOPCF) -t $(<:%.bdf=%-ISO8859-4.bdf) | gzip > $@
+	@del $(<:%.bdf=%-ISO8859-4.bdf)
 
-%-ISO8859-7.bdf: %.bdf
+$(DESTDIR)\%-ISO8859-5.pcf.gz: %.bdf
+	@del -e $(<:%.bdf=%-ISO8859-5.bdf)
+	$(UCS2ANY) $< $(UTIL_DIR)\map-ISO8859-5 ISO8859-5
 	@del -e $@
-	$(UCS2ANY) $< $(UTIL_DIR)\map-ISO8859-7 ISO8859-7
+	$(BDFTOPCF) -t $(<:%.bdf=%-ISO8859-5.bdf) | gzip > $@
+	@del $(<:%.bdf=%-ISO8859-5.bdf)
 
-%-ISO8859-8.bdf: %.bdf
+$(DESTDIR)\%-ISO8859-7.pcf.gz: %.bdf
+	@del -e $(<:%.bdf=%-ISO8859-7.bdf)
+	$(UCS2ANY) $< $(UTIL_DIR)\map-ISO8859-7 ISO8859-7
 	@del -e $@
-	$(UCS2ANY) $< $(UTIL_DIR)\map-ISO8859-8 ISO8859-8
+	$(BDFTOPCF) -t $(<:%.bdf=%-ISO8859-7.bdf) | gzip > $@
+	@del $(<:%.bdf=%-ISO8859-7.bdf)
 
-%-ISO8859-9.bdf: %.bdf
+$(DESTDIR)\%-ISO8859-8.pcf.gz: %.bdf
+	@del -e $(<:%.bdf=%-ISO8859-8.bdf)
+	$(UCS2ANY) $< $(UTIL_DIR)\map-ISO8859-8 ISO8859-8
 	@del -e $@
-	$(UCS2ANY) $< $(UTIL_DIR)\map-ISO8859-9 ISO8859-9
+	$(BDFTOPCF) -t $(<:%.bdf=%-ISO8859-8.bdf) | gzip > $@
+	@del $(<:%.bdf=%-ISO8859-8.bdf)
 
-%-ISO8859-10.bdf: %.bdf
+$(DESTDIR)\%-ISO8859-9.pcf.gz: %.bdf
+	@del -e $(<:%.bdf=%-ISO8859-9.bdf)
+	$(UCS2ANY) $< $(UTIL_DIR)\map-ISO8859-9 ISO8859-9
 	@del -e $@
+	$(BDFTOPCF) -t $(<:%.bdf=%-ISO8859-9.bdf) | gzip > $@
+	@del $(<:%.bdf=%-ISO8859-9.bdf)
+
+$(DESTDIR)\%-ISO8859-10.pcf.gz: %.bdf
+	@del -e $(<:%.bdf=%-ISO8859-10.bdf)
 	$(UCS2ANY) $< $(UTIL_DIR)\map-ISO8859-10 ISO8859-10
+	@del -e $@
+	$(BDFTOPCF) -t $(<:%.bdf=%-ISO8859-10.bdf) | gzip > $@
+	@del $(<:%.bdf=%-ISO8859-10.bdf)
 
-%-ISO8859-11.bdf: %.bdf
-	@rm -f $@
+$(DESTDIR)\%-ISO8859-11.pcf.gz: %.bdf
+	@del -e $(<:%.bdf=%-ISO8859-11.bdf)
 	$(UCS2ANY) $< $(UTIL_DIR)\map-ISO8859-11 ISO8859-11
-
-%-ISO8859-13.bdf: %.bdf
 	@del -e $@
-	$(UCS2ANY) $< $(UTIL_DIR)\map-ISO8859-13 ISO8859-13
+	$(BDFTOPCF) -t $(<:%.bdf=%-ISO8859-11.bdf) | gzip > $@
+	@del $(<:%.bdf=%-ISO8859-11.bdf)
 
-%-ISO8859-14.bdf: %.bdf
+$(DESTDIR)\%-ISO8859-13.pcf.gz: %.bdf
+	@del -e $(<:%.bdf=%-ISO8859-13.bdf)
+	$(UCS2ANY) $< $(UTIL_DIR)\map-ISO8859-13 ISO8859-13
 	@del -e $@
-	$(UCS2ANY) $< $(UTIL_DIR)\map-ISO8859-14 ISO8859-14
+	$(BDFTOPCF) -t $(<:%.bdf=%-ISO8859-13.bdf) | gzip > $@
+	@del $(<:%.bdf=%-ISO8859-13.bdf)
 
-%-ISO8859-15.bdf: %.bdf
+$(DESTDIR)\%-ISO8859-14.pcf.gz: %.bdf
+	@del -e $(<:%.bdf=%-ISO8859-14.bdf)
+	$(UCS2ANY) $< $(UTIL_DIR)\map-ISO8859-14 ISO8859-14
 	@del -e $@
-	$(UCS2ANY) $< $(UTIL_DIR)\map-ISO8859-15 ISO8859-15
+	$(BDFTOPCF) -t $(<:%.bdf=%-ISO8859-14.bdf) | gzip > $@
+	@del $(<:%.bdf=%-ISO8859-14.bdf)
 
-%-ISO8859-16.bdf: %.bdf
+$(DESTDIR)\%-ISO8859-15.pcf.gz: %.bdf
+	@del -e $(<:%.bdf=%-ISO8859-15.bdf)
+	$(UCS2ANY) $< $(UTIL_DIR)\map-ISO8859-15 ISO8859-15
 	@del -e $@
-	$(UCS2ANY) $< $(UTIL_DIR)\map-ISO8859-16 ISO8859-16
+	$(BDFTOPCF) -t $(<:%.bdf=%-ISO8859-15.bdf) | gzip > $@
+	@del $(<:%.bdf=%-ISO8859-15.bdf)
 
-%-KOI8-R.bdf: %.bdf
+$(DESTDIR)\%-ISO8859-16.pcf.gz: %.bdf
+	@del -e $(<:%.bdf=%-ISO8859-16.bdf)
+	$(UCS2ANY) $< $(UTIL_DIR)\map-ISO8859-16 ISO8859-16
 	@del -e $@
-	$(UCS2ANY) $< $(UTIL_DIR)\map-KOI8-R KOI8-R
+	$(BDFTOPCF) -t $(<:%.bdf=%-ISO8859-16.bdf) | gzip > $@
+	@del $(<:%.bdf=%-ISO8859-16.bdf)
 
-%-JISX0201.1976-0.bdf: %.bdf
+$(DESTDIR)\%-KOI8-R.pcf.gz: %.bdf
+	@del -e $(<:%.bdf=%-KOI8-R.bdf)
+	$(UCS2ANY) $< $(UTIL_DIR)\map-KOI8-R KOI8-R
 	@del -e $@
-	$(UCS2ANY) $< $(UTIL_DIR)\map-JISX0201.1976-0 JISX0201.1976-0
+	$(BDFTOPCF) -t $(<:%.bdf=%-KOI8-R.bdf) | gzip > $@
+	@del $(<:%.bdf=%-KOI8-R.bdf)
 
-#%.pcf.gz: %t.bdf
-#	@del -e $@
-#	$(BDFTOPCF) -t $< | gzip > $@
+$(DESTDIR)\%-JISX0201.1976-0.pcf.gz: %.bdf
+	@del -e $(<:%.bdf=%-JISX0201.1976-0.bdf)
+	$(UCS2ANY) $< $(UTIL_DIR)\map-JISX0201.1976-0 JISX0201.1976-0
+	@del -e $@
+	$(BDFTOPCF) -t $(<:%.bdf=%-JISX0201.1976-0.bdf) | gzip > $@
+	@del $(<:%.bdf=%-JISX0201.1976-0.bdf)
 
 font_DATA = \
 	$(PCF_FILES) \
@@ -295,23 +320,6 @@ font_DATA = \
 	$(ISO8859_16_PCF_FILES) \
 	$(KOI8_R_PCF_FILES) \
 	$(JISX0201_PCF_FILES)
-BUILT_BDF_FILES = \
-	$(ISO8859_1_BDF_FILES) \
-	$(ISO8859_2_BDF_FILES) \
-	$(ISO8859_3_BDF_FILES) \
-	$(ISO8859_4_BDF_FILES) \
-	$(ISO8859_5_BDF_FILES) \
-	$(ISO8859_7_BDF_FILES) \
-	$(ISO8859_8_BDF_FILES) \
-	$(ISO8859_9_BDF_FILES) \
-	$(ISO8859_10_BDF_FILES) \
-	$(ISO8859_11_BDF_FILES) \
-	$(ISO8859_13_BDF_FILES) \
-	$(ISO8859_14_BDF_FILES) \
-	$(ISO8859_15_BDF_FILES) \
-	$(ISO8859_16_BDF_FILES) \
-	$(KOI8_R_BDF_FILES) \
-	$(JISX0201_BDF_FILES)
 
 all: $(DESTDIR) $(UCS2ANY) $(DESTDIR)\fonts.scale $(DESTDIR)\fonts.dir $(DESTDIR)\fonts.alias
 
@@ -329,3 +337,4 @@ $(DESTDIR)\fonts.dir: $(font_DATA)
 
 $(DESTDIR)\fonts.alias: fonts.alias
 	copy $< $@
+