diff options
| author | marha <marha@users.sourceforge.net> | 2009-07-27 14:09:54 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2009-07-27 14:09:54 +0000 |
| commit | e3cca1a275a55fcc5e074a7cc7aaa5d0764b9659 (patch) | |
| tree | eec421a528cb2f0fdaff43d4cf82fc0af89c0392 | |
| parent | 2553bdd7c359cd87525d367761c86932cec5adff (diff) | |
| download | vcxsrv-e3cca1a275a55fcc5e074a7cc7aaa5d0764b9659.tar.gz vcxsrv-e3cca1a275a55fcc5e074a7cc7aaa5d0764b9659.tar.bz2 vcxsrv-e3cca1a275a55fcc5e074a7cc7aaa5d0764b9659.zip | |
vcxsrv compiles now. Still run-time errors.
42 files changed, 459 insertions, 244 deletions
diff --git a/X11/fonts/fontmisc.h b/X11/fonts/fontmisc.h index 7b8651706..92d4966ca 100644 --- a/X11/fonts/fontmisc.h +++ b/X11/fonts/fontmisc.h @@ -68,6 +68,7 @@ extern Atom MakeAtom ( char *string, unsigned len, int makeit ); extern int ValidAtom ( Atom atom ); extern char *NameForAtom (Atom atom); +#ifndef _MSC_VER #ifndef _HAVE_XALLOC_DECLS #define _HAVE_XALLOC_DECLS extern pointer Xalloc(unsigned long); @@ -75,14 +76,22 @@ extern pointer Xrealloc(pointer, unsigned long); extern void Xfree(pointer); extern pointer Xcalloc(unsigned long); #endif +#endif extern int f_strcasecmp(const char *s1, const char *s2); #ifndef xalloc +#ifdef _MSC_VER +#define xalloc(n) malloc ((unsigned) n) +#define xfree(p) free ((pointer) p) +#define xrealloc(p,n) realloc (p,n) +#define xcalloc(n,s) calloc(n, s) +#else #define xalloc(n) Xalloc ((unsigned) n) #define xfree(p) Xfree ((pointer) p) #define xrealloc(p,n) Xrealloc ((pointer)p,n) #define xcalloc(n,s) Xcalloc((unsigned) n * (unsigned) s) #endif +#endif #define lowbit(x) ((x) & (~(x) + 1)) #undef assert diff --git a/freetype/freetype.vcproj b/freetype/freetype.vcproj index 74d9d4916..107138f5a 100644 --- a/freetype/freetype.vcproj +++ b/freetype/freetype.vcproj @@ -688,18 +688,6 @@ >
</File>
<File
- RelativePath=".\src\pcf\pcfutil.c"
- >
- <FileConfiguration
- Name="Release Multithreaded|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- </File>
- <File
RelativePath=".\src\pfr\pfrcmap.c"
>
</File>
diff --git a/makefile.after b/makefile.after index 8c3738c09..aa67e4d33 100644 --- a/makefile.after +++ b/makefile.after @@ -72,11 +72,12 @@ $(OBJDIR)\%.res : %.rc BDFTOPCF= $(MHMAKECONF)\bdftopcf\$(OBJDIR)\bdftopcf.exe
load_makefile $(MHMAKECONF)\bdftopcf\makefile MAKESERVER=0 DEBUG=$(DEBUG)
+ifdef INC_BDF_RULES
$(DESTDIR)\%.pcf.gz: %.bdf
@del -e $@
$(BDFTOPCF) -t $< | gzip > $@
$(DESTDIR)\%.enc.gz: %.enc
gzip -c < $< > $@
-
+endif
diff --git a/pthreads/Makefile b/pthreads/Makefile index a28ea4aad..1faac14e3 100644 --- a/pthreads/Makefile +++ b/pthreads/Makefile @@ -45,8 +45,14 @@ VSEFLAGSD = $(CFLAGSD) VCFLAGS = $(CFLAGS) VCFLAGSD= $(CFLAGSD) +!ifdef DEBUG +OUTDIR=obj_d +!else +OUTDIR=obj +!endif + DLL_INLINED_OBJS = \ - pthread.obj \ + $(OUTDIR)\pthread.obj \ version.res # Aggregate modules for inlinability @@ -439,7 +445,7 @@ VC-static: @ nmake /nologo EHFLAGS="$(OPTIM) $(VCFLAGS) /DPTW32_BUILD_INLINED /DPTW32_STATIC_LIB" CLEANUP=__CLEANUP_C pthreadVC$(DLL_VER).static VC-static-debug: - @ nmake /nologo EHFLAGS="$(OPTIMD) $(VCFLAGSD) /DPTW32_BUILD_INLINED /DPTW32_STATIC_LIB" CLEANUP=__CLEANUP_C pthreadVC$(DLL_VERD).static + @ nmake /nologo DEBUG=1 EHFLAGS="$(OPTIMD) $(VCFLAGSD) /DPTW32_BUILD_INLINED /DPTW32_STATIC_LIB" CLEANUP=__CLEANUP_C pthreadVC$(DLL_VERD).static realclean: clean if exist pthread*.dll del pthread*.dll @@ -469,18 +475,24 @@ $(DLLS): $(DLL_OBJS) /link /nodefaultlib:libcmt /implib:$*.lib \ msvcrt.lib wsock32.lib /out:$@ -$(INLINED_STAMPS): $(DLL_INLINED_OBJS) +$(INLINED_STAMPS): $(OUTDIR) $(DLL_INLINED_OBJS) cl /LDd /Zi /nologo $(DLL_INLINED_OBJS) \ /link /nodefaultlib:libcmt /implib:$*.lib \ msvcrt.lib wsock32.lib /out:$*.dll -$(STATIC_STAMPS): $(DLL_INLINED_OBJS) +$(STATIC_STAMPS): $(OUTDIR) $(DLL_INLINED_OBJS) if exist $*.lib del $*.lib lib $(DLL_INLINED_OBJS) /out:$*.lib - + +$(OUTDIR): + mkdir $(OUTDIR) + .c.obj: cl $(EHFLAGS) /D$(CLEANUP) -c $< +.c{$(OUTDIR)}.obj: + cl $(EHFLAGS) /D$(CLEANUP) -Fo"$@" -c $< + .rc.res: rc /dPTW32_RC_MSC /d$(CLEANUP) $< diff --git a/xkbcomp/xkbscan.c b/xkbcomp/xkbscan.c index 31cafd4ab..a4289a39f 100644 --- a/xkbcomp/xkbscan.c +++ b/xkbcomp/xkbscan.c @@ -31,7 +31,7 @@ #include <X11/XKBlib.h> #include "tokens.h" -#define DEBUG_VAR scanDebug + #include "utils.h" #include "parseutils.h" diff --git a/xorg-server/Xext/Makefile b/xorg-server/Xext/Makefile index f78eff1eb..7eda4bae5 100644 --- a/xorg-server/Xext/Makefile +++ b/xorg-server/Xext/Makefile @@ -1,12 +1,8 @@ CSRCS=\ bigreq.c \ -cup.c \ dpms.c \ dpmsstubs.c \ -EVI.c \ mbuf.c \ -mitmisc.c \ -sampleEVI.c \ saver.c \ security.c \ shape.c \ @@ -14,9 +10,9 @@ sleepuntil.c \ sync.c \ xace.c \ xcmisc.c \ -xevie.c \ xres.c \ -xtest.c +xtest.c \ +geext.c #shm.c \ #appgroup.c \ diff --git a/xorg-server/Xi/makefile b/xorg-server/Xi/makefile index 422f79acb..e7d9fa24b 100644 --- a/xorg-server/Xi/makefile +++ b/xorg-server/Xi/makefile @@ -34,7 +34,8 @@ CSRCS=allowev.c \ setmode.c \ ungrdev.c \ ungrdevb.c \ - ungrdevk.c + ungrdevk.c \ + xiproperty.c LIBRARY=libXi diff --git a/xorg-server/composite/makefile b/xorg-server/composite/makefile index 081608674..1ab95ebba 100644 --- a/xorg-server/composite/makefile +++ b/xorg-server/composite/makefile @@ -1,4 +1,9 @@ -CSRCS=compalloc.c compext.c compinit.c compwindow.c
LIBRARY=libcomposite
+CSRCS = \
+ compalloc.c \
+ compext.c \
+ compinit.c \
+ compoverlay.c \
+ compwindow.c
diff --git a/xorg-server/dix/getevents.c b/xorg-server/dix/getevents.c index 9747b35a6..50a8f5690 100644 --- a/xorg-server/dix/getevents.c +++ b/xorg-server/dix/getevents.c @@ -112,6 +112,13 @@ key_autorepeats(DeviceIntPtr pDev, int key_code) (1 << (key_code & 7))); } +#ifdef _MSC_VER +float roundf(float f) +{ + return ((f<0.0f) ? ceil(f-.5) : floor (f+.5)); +} +#endif + /** * Rescale the coord between the two axis ranges. */ diff --git a/xorg-server/dix/makefile b/xorg-server/dix/makefile index 24afd2b94..f15ccd91a 100644 --- a/xorg-server/dix/makefile +++ b/xorg-server/dix/makefile @@ -1,8 +1,36 @@ DEFINES += FONTDEBUG
-CSRCS=atom.c colormap.c cursor.c deprecated.c devices.c dispatch.c dix.c dixfonts.c dixutils.c events.c extension.c ffs.c gc.c \
-getevents.c globals.c glyphcurs.c grabs.c initatoms.c main.c pixmap.c privates.c property.c registry.c resource.c selection.c \
-strcasecmp.c strcasestr.c swaprep.c swapreq.c tables.c window.c xpstubs.c
-
LIBRARY=libdix
+CSRCS=\
+ atom.c \
+ colormap.c \
+ cursor.c \
+ deprecated.c \
+ devices.c \
+ dispatch.c \
+ dixfonts.c \
+ dixutils.c \
+ enterleave.c \
+ events.c \
+ extension.c \
+ ffs.c \
+ gc.c \
+ getevents.c \
+ globals.c \
+ glyphcurs.c \
+ grabs.c \
+ initatoms.c \
+ main.c \
+ pixmap.c \
+ privates.c \
+ property.c \
+ ptrveloc.c \
+ registry.c \
+ resource.c \
+ selection.c \
+ swaprep.c \
+ swapreq.c \
+ tables.c \
+ window.c
+
diff --git a/xorg-server/dix/ptrveloc.c b/xorg-server/dix/ptrveloc.c index e9d4e882f..58b6a81da 100644 --- a/xorg-server/dix/ptrveloc.c +++ b/xorg-server/dix/ptrveloc.c @@ -26,12 +26,17 @@ #include <dix-config.h> #endif +#ifdef _MSC_VER +#define _USE_MATH_DEFINES +#endif + #include <math.h> #include <ptrveloc.h> #include <inputstr.h> #include <assert.h> #include <os.h> + /***************************************************************************** * Predictable pointer acceleration * @@ -58,6 +63,10 @@ * ****************************************************************************/ +#ifdef _MSC_VER +#define inline __inline +#endif + /* fwds */ static inline void FeedFilterStage(FilterStagePtr s, float value, int tdiff); diff --git a/xorg-server/dix/window.c b/xorg-server/dix/window.c index c19990ac1..03ef09ac4 100644 --- a/xorg-server/dix/window.c +++ b/xorg-server/dix/window.c @@ -3087,11 +3087,14 @@ NotClippedByChildren(WindowPtr pWin) void SendVisibilityNotify(WindowPtr pWin) { +#ifndef NO_XINERAMA_PORT + unsigned int visibility; +#endif xEvent event; if (!MapUnmapEventsEnabled(pWin)) return; #ifndef NO_XINERAMA_PORT - unsigned int visibility = pWin->visibility; + visibility = pWin->visibility; #endif #ifdef PANORAMIX /* This is not quite correct yet, but it's close */ diff --git a/xorg-server/exa/exa_render.c b/xorg-server/exa/exa_render.c index 9a79b4781..e4fb13cf1 100644 --- a/xorg-server/exa/exa_render.c +++ b/xorg-server/exa/exa_render.c @@ -1054,15 +1054,15 @@ exaTrapezoids (CARD8 op, PicturePtr pSrc, PicturePtr pDst, BoxRec bounds; if (maskFormat) { + PicturePtr pPicture; + INT16 xDst, yDst; + INT16 xRel, yRel; + miTrapezoidBounds (ntrap, traps, &bounds); if (bounds.y1 >= bounds.y2 || bounds.x1 >= bounds.x2) return; - PicturePtr pPicture; - INT16 xDst, yDst; - INT16 xRel, yRel; - xDst = traps[0].left.p1.x >> 16; yDst = traps[0].left.p1.y >> 16; @@ -1118,15 +1118,15 @@ exaTriangles (CARD8 op, PicturePtr pSrc, PicturePtr pDst, BoxRec bounds; if (maskFormat) { + PicturePtr pPicture; + INT16 xDst, yDst; + INT16 xRel, yRel; + miTriangleBounds (ntri, tris, &bounds); if (bounds.y1 >= bounds.y2 || bounds.x1 >= bounds.x2) return; - PicturePtr pPicture; - INT16 xDst, yDst; - INT16 xRel, yRel; - xDst = tris[0].p1.x >> 16; yDst = tris[0].p1.y >> 16; diff --git a/xorg-server/fb/makefile b/xorg-server/fb/makefile index fd6ae3e7c..717c07332 100644 --- a/xorg-server/fb/makefile +++ b/xorg-server/fb/makefile @@ -1,9 +1,37 @@ -CSRCS=fb24_32.c fballpriv.c fbarc.c fbbits.c fbblt.c fbbltone.c fbcmap_mi.c fbcopy.c fbfill.c fbfillrect.c fbfillsp.c \
-fbgc.c fbgetsp.c fbglyph.c fbimage.c fbline.c fboverlay.c fbpict.c fbpixmap.c fbpoint.c fbpseudocolor.c fbpush.c fbscreen.c \
-fbseg.c fbsetsp.c fbsolid.c fbstipple.c fbtile.c fbtrap.c fbutil.c fbwindow.c
LIBRARY=libfb
CCFLAGS:=$(CCFLAGS:-RTCc=)
+CSRCS = \
+ fb24_32.c \
+ fballpriv.c \
+ fbarc.c \
+ fbbits.c \
+ fbblt.c \
+ fbbltone.c \
+ fbcopy.c \
+ fbfill.c \
+ fbfillrect.c \
+ fbfillsp.c \
+ fbgc.c \
+ fbgetsp.c \
+ fbglyph.c \
+ fbimage.c \
+ fbline.c \
+ fboverlay.c \
+ fbpict.c \
+ fbpixmap.c \
+ fbpoint.c \
+ fbpush.c \
+ fbscreen.c \
+ fbseg.c \
+ fbsetsp.c \
+ fbsolid.c \
+ fbstipple.c \
+ fbtile.c \
+ fbtrap.c \
+ fbutil.c \
+ fbwindow.c \
+ fbcmap_mi.c
diff --git a/xorg-server/fonts.src/100dpi/makefile b/xorg-server/fonts.src/100dpi/makefile index 5b792525c..e66fefaaf 100644 --- a/xorg-server/fonts.src/100dpi/makefile +++ b/xorg-server/fonts.src/100dpi/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\100dpi $(DESTDIR): if not isdir "$(DESTDIR)" mkdir /s "$(DESTDIR)" @@ -233,31 +235,22 @@ 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_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_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) UTIL_DIR = ..\font-util @@ -265,43 +258,69 @@ UCS2ANY = $(UTIL_DIR)\$(OBJDIR)\ucs2any.exe load_makefile $(UTIL_DIR)\makefile MAKESERVER=0 DEBUG=$(DEBUG) -%-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-9.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-9 ISO8859-9 + $(BDFTOPCF) -t $(<:%.bdf=%-ISO8859-4.bdf) | gzip > $@ + @del $(<:%.bdf=%-ISO8859-4.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 $@ - $(UCS2ANY) $< $(UTIL_DIR)\map-ISO8859-10 ISO8859-10 + $(BDFTOPCF) -t $(<:%.bdf=%-ISO8859-9.bdf) | gzip > $@ + @del $(<:%.bdf=%-ISO8859-9.bdf) -%-ISO8859-13.bdf: %.bdf +$(DESTDIR)\%-ISO8859-10.pcf.gz: %.bdf + @del -e $(<:%.bdf=%-ISO8859-10.bdf) + $(UCS2ANY) $< $(UTIL_DIR)\map-ISO8859-10 ISO8859-10 @del -e $@ - $(UCS2ANY) $< $(UTIL_DIR)\map-ISO8859-13 ISO8859-13 + $(BDFTOPCF) -t $(<:%.bdf=%-ISO8859-10.bdf) | gzip > $@ + @del $(<:%.bdf=%-ISO8859-10.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 $@ + $(BDFTOPCF) -t $(<:%.bdf=%-ISO8859-14.bdf) | gzip > $@ + @del $(<:%.bdf=%-ISO8859-14.bdf) + +$(DESTDIR)\%-ISO8859-15.pcf.gz: %.bdf + @del -e $(<:%.bdf=%-ISO8859-15.bdf) $(UCS2ANY) $< $(UTIL_DIR)\map-ISO8859-15 ISO8859-15 + @del -e $@ + $(BDFTOPCF) -t $(<:%.bdf=%-ISO8859-15.bdf) | gzip > $@ + @del $(<:%.bdf=%-ISO8859-15.bdf) -fontdir = . font_DATA = \ $(PCF_FILES) \ $(ISO8859_1_PCF_FILES) \ @@ -313,16 +332,6 @@ font_DATA = \ $(ISO8859_13_PCF_FILES) \ $(ISO8859_14_PCF_FILES) \ $(ISO8859_15_PCF_FILES) -BUILT_BDF_FILES = \ - $(ISO8859_1_BDF_FILES) \ - $(ISO8859_2_BDF_FILES) \ - $(ISO8859_3_BDF_FILES) \ - $(ISO8859_4_BDF_FILES) \ - $(ISO8859_9_BDF_FILES) \ - $(ISO8859_10_BDF_FILES) \ - $(ISO8859_13_BDF_FILES) \ - $(ISO8859_14_BDF_FILES) \ - $(ISO8859_15_BDF_FILES) all: $(DESTDIR) $(UCS2ANY) $(DESTDIR)\fonts.scale $(DESTDIR)\fonts.dir $(DESTDIR)\fonts.alias diff --git a/xorg-server/fonts.src/75dpi/makefile b/xorg-server/fonts.src/75dpi/makefile index e7d8bf085..850e53a13 100644 --- a/xorg-server/fonts.src/75dpi/makefile +++ b/xorg-server/fonts.src/75dpi/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\75dpi $(DESTDIR): if not isdir "$(DESTDIR)" mkdir /s "$(DESTDIR)" @@ -233,31 +235,22 @@ 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_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_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) UTIL_DIR = ..\font-util @@ -265,43 +258,69 @@ UCS2ANY = $(UTIL_DIR)\$(OBJDIR)\ucs2any.exe load_makefile $(UTIL_DIR)\makefile MAKESERVER=0 DEBUG=$(DEBUG) -%-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-9.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-9 ISO8859-9 + $(BDFTOPCF) -t $(<:%.bdf=%-ISO8859-4.bdf) | gzip > $@ + @del $(<:%.bdf=%-ISO8859-4.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 $@ - $(UCS2ANY) $< $(UTIL_DIR)\map-ISO8859-10 ISO8859-10 + $(BDFTOPCF) -t $(<:%.bdf=%-ISO8859-9.bdf) | gzip > $@ + @del $(<:%.bdf=%-ISO8859-9.bdf) -%-ISO8859-13.bdf: %.bdf +$(DESTDIR)\%-ISO8859-10.pcf.gz: %.bdf + @del -e $(<:%.bdf=%-ISO8859-10.bdf) + $(UCS2ANY) $< $(UTIL_DIR)\map-ISO8859-10 ISO8859-10 @del -e $@ - $(UCS2ANY) $< $(UTIL_DIR)\map-ISO8859-13 ISO8859-13 + $(BDFTOPCF) -t $(<:%.bdf=%-ISO8859-10.bdf) | gzip > $@ + @del $(<:%.bdf=%-ISO8859-10.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 $@ + $(BDFTOPCF) -t $(<:%.bdf=%-ISO8859-14.bdf) | gzip > $@ + @del $(<:%.bdf=%-ISO8859-14.bdf) + +$(DESTDIR)\%-ISO8859-15.pcf.gz: %.bdf + @del -e $(<:%.bdf=%-ISO8859-15.bdf) $(UCS2ANY) $< $(UTIL_DIR)\map-ISO8859-15 ISO8859-15 + @del -e $@ + $(BDFTOPCF) -t $(<:%.bdf=%-ISO8859-15.bdf) | gzip > $@ + @del $(<:%.bdf=%-ISO8859-15.bdf) -fontdir = . font_DATA = \ $(PCF_FILES) \ $(ISO8859_1_PCF_FILES) \ @@ -313,16 +332,6 @@ font_DATA = \ $(ISO8859_13_PCF_FILES) \ $(ISO8859_14_PCF_FILES) \ $(ISO8859_15_PCF_FILES) -BUILT_BDF_FILES = \ - $(ISO8859_1_BDF_FILES) \ - $(ISO8859_2_BDF_FILES) \ - $(ISO8859_3_BDF_FILES) \ - $(ISO8859_4_BDF_FILES) \ - $(ISO8859_9_BDF_FILES) \ - $(ISO8859_10_BDF_FILES) \ - $(ISO8859_13_BDF_FILES) \ - $(ISO8859_14_BDF_FILES) \ - $(ISO8859_15_BDF_FILES) all: $(DESTDIR) $(UCS2ANY) $(DESTDIR)\fonts.scale $(DESTDIR)\fonts.dir $(DESTDIR)\fonts.alias diff --git a/xorg-server/fonts.src/cyrillic/makefile b/xorg-server/fonts.src/cyrillic/makefile index faa115461..439c9e342 100644 --- a/xorg-server/fonts.src/cyrillic/makefile +++ b/xorg-server/fonts.src/cyrillic/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\cyrillic $(DESTDIR): if not isdir "$(DESTDIR)" mkdir /s "$(DESTDIR)" diff --git a/xorg-server/fonts.src/encodings/large/makefile b/xorg-server/fonts.src/encodings/large/makefile index 6c60c5651..9701bfd39 100644 --- a/xorg-server/fonts.src/encodings/large/makefile +++ b/xorg-server/fonts.src/encodings/large/makefile @@ -1,6 +1,9 @@ ifeq ($(MAKESERVER),1) $(error Please do not specify MAKESERVER=1) endif + +INC_BDF_RULES=1 + DESTDIR=$(MHMAKECONF)\xorg-server\fonts\encodings\large $(DESTDIR): if not isdir "$(DESTDIR)" mkdir /s "$(DESTDIR)" diff --git a/xorg-server/fonts.src/encodings/makefile b/xorg-server/fonts.src/encodings/makefile index 1f92bf112..ee3809007 100644 --- a/xorg-server/fonts.src/encodings/makefile +++ b/xorg-server/fonts.src/encodings/makefile @@ -3,6 +3,8 @@ $(error Please do not specify MAKESERVER=1) endif load_makefile large\makefile +INC_BDF_RULES=1 + DESTDIR=$(MHMAKECONF)\xorg-server\fonts\encodings $(DESTDIR): if not isdir "$(DESTDIR)" mkdir /s "$(DESTDIR)" 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 $< $@ + diff --git a/xorg-server/glx/makefile b/xorg-server/glx/makefile index 8e595d7ab..0debc92a0 100644 --- a/xorg-server/glx/makefile +++ b/xorg-server/glx/makefile @@ -1,4 +1,4 @@ -CSRCS=glapi.c glthread.c glxcmds.c glxcmdsswap.c glxdricommon.c glxext.c glxscreens.c glxutil.c \
+CSRCS=glapi.c glthread.c glxcmds.c glxcmdsswap.c glxdricommon.c glxext.c glxscreens.c \
indirect_dispatch.c indirect_dispatch_swap.c indirect_program.c indirect_reqsize.c indirect_size_get.c indirect_table.c indirect_texture_compression.c \
indirect_util.c render2.c render2swap.c renderpix.c renderpixswap.c rensize.c single2.c single2swap.c singlepix.c singlepixswap.c singlesize.c \
swap_interval.c xfont.c glxdriswrast.c
diff --git a/xorg-server/hw/kdrive/ephyr/ephyrlog.h b/xorg-server/hw/kdrive/ephyr/ephyrlog.h index a07a0a097..ba52a3bce 100644 --- a/xorg-server/hw/kdrive/ephyr/ephyrlog.h +++ b/xorg-server/hw/kdrive/ephyr/ephyrlog.h @@ -43,14 +43,14 @@ #ifndef EPHYR_LOG #define EPHYR_LOG(...) \ LogMessageVerb(X_NOTICE, INFO_LOG_LEVEL, "in %s:%d:%s: ",\ - __FILE__, __LINE__, __func__) ; \ + __FILE__, __LINE__, __FUNCTION__) ; \ LogMessageVerb(X_NOTICE, INFO_LOG_LEVEL, __VA_ARGS__) #endif /*nomadik_log*/ #ifndef EPHYR_LOG_ERROR #define EPHYR_LOG_ERROR(...) \ LogMessageVerb(X_NOTICE, ERROR_LOG_LEVEL, "Error:in %s:%d:%s: ",\ - __FILE__, __LINE__, __func__) ; \ + __FILE__, __LINE__, __FUNCTION__) ; \ LogMessageVerb(X_NOTICE, ERROR_LOG_LEVEL, __VA_ARGS__) #endif /*EPHYR_LOG_ERROR*/ diff --git a/xorg-server/hw/kdrive/src/kdrive.c b/xorg-server/hw/kdrive/src/kdrive.c index 41e0d496d..4b9634f97 100644 --- a/xorg-server/hw/kdrive/src/kdrive.c +++ b/xorg-server/hw/kdrive/src/kdrive.c @@ -1373,10 +1373,12 @@ KdInitOutput (ScreenInfo *pScreenInfo, signal(SIGSEGV, KdBacktrace); } +#ifndef _MSC_VER void OsVendorFatalError(void) { } +#endif #ifdef DPMSExtension #ifndef _MSC_VER diff --git a/xorg-server/hw/kdrive/src/makefile b/xorg-server/hw/kdrive/src/makefile index 1400d0427..db710ec4f 100644 --- a/xorg-server/hw/kdrive/src/makefile +++ b/xorg-server/hw/kdrive/src/makefile @@ -1,20 +1,15 @@ LIBRARY = libkdrive -CSRCS = kaa.c \ - kaapict.c \ - kasync.c \ +CSRCS = \ kcmap.c \ kcurscol.c \ kinfo.c \ kkeymap.c \ kmap.c \ kmode.c \ - knoop.c \ - koffscreen.c \ kshadow.c \ kinput.c \ - kdrive.c \ - ktest.c + kdrive.c diff --git a/xorg-server/hw/xwin/InitInput.c b/xorg-server/hw/xwin/InitInput.c index bce7ac54e..65572ccd8 100644 --- a/xorg-server/hw/xwin/InitInput.c +++ b/xorg-server/hw/xwin/InitInput.c @@ -95,7 +95,7 @@ ProcessInputEvents (void) #endif mieqProcessInputEvents (); - miPointerUpdate (); + miPointerUpdateSprite(inputInfo.pointer); #if 0 ErrorF ("ProcessInputEvents - returning\n"); @@ -144,8 +144,8 @@ InitInput (int argc, char *argv[]) } #endif - pMouse = AddInputDevice (winMouseProc, TRUE); - pKeyboard = AddInputDevice (winKeybdProc, TRUE); + pMouse = AddInputDevice (serverClient, winMouseProc, TRUE); + pKeyboard = AddInputDevice (serverClient, winKeybdProc, TRUE); RegisterPointerDevice (pMouse); RegisterKeyboardDevice (pKeyboard); diff --git a/xorg-server/hw/xwin/makefile b/xorg-server/hw/xwin/makefile index 5b409759d..7fc052457 100644 --- a/xorg-server/hw/xwin/makefile +++ b/xorg-server/hw/xwin/makefile @@ -85,7 +85,6 @@ SRCS_NATIVEGDI = \ winnativegdi.c \ winpixmap.c \ winpolyline.c \ - winpushpxl.c \ winrop.c \ winsetsp.c CSRCS += $(SRCS_NATIVEGDI) diff --git a/xorg-server/hw/xwin/wincursor.c b/xorg-server/hw/xwin/wincursor.c index 8ace15fcd..75a1adf5b 100644 --- a/xorg-server/hw/xwin/wincursor.c +++ b/xorg-server/hw/xwin/wincursor.c @@ -62,7 +62,7 @@ extern Bool g_fSoftwareCursor; */ static void -winPointerWarpCursor (ScreenPtr pScreen, int x, int y); +winPointerWarpCursor (DeviceIntPtr pDev, ScreenPtr pScreen, int x, int y); static Bool winCursorOffScreen (ScreenPtr *ppScreen, int *x, int *y); @@ -79,7 +79,7 @@ miPointerScreenFuncRec g_winPointerCursorFuncs = static void -winPointerWarpCursor (ScreenPtr pScreen, int x, int y) +winPointerWarpCursor (DeviceIntPtr pDev, ScreenPtr pScreen, int x, int y) { winScreenPriv(pScreen); RECT rcClient; @@ -127,7 +127,7 @@ winPointerWarpCursor (ScreenPtr pScreen, int x, int y) } /* Call the mi warp procedure to do the actual warping in X. */ - miPointerWarpCursor (pScreen, x, y); + miPointerWarpCursor (pDev, pScreen, x, y); } static Bool @@ -444,7 +444,7 @@ winLoadCursor (ScreenPtr pScreen, CursorPtr pCursor, int screen) * Convert the X cursor representation to native format if possible. */ static Bool -winRealizeCursor (ScreenPtr pScreen, CursorPtr pCursor) +winRealizeCursor (DeviceIntPtr pDev, ScreenPtr pScreen, CursorPtr pCursor) { if(pCursor == NULL || pCursor->bits == NULL) return FALSE; @@ -460,7 +460,7 @@ winRealizeCursor (ScreenPtr pScreen, CursorPtr pCursor) * Free the storage space associated with a realized cursor. */ static Bool -winUnrealizeCursor(ScreenPtr pScreen, CursorPtr pCursor) +winUnrealizeCursor(DeviceIntPtr pDev, ScreenPtr pScreen, CursorPtr pCursor) { return TRUE; } @@ -471,7 +471,7 @@ winUnrealizeCursor(ScreenPtr pScreen, CursorPtr pCursor) * Set the cursor sprite and position. */ static void -winSetCursor (ScreenPtr pScreen, CursorPtr pCursor, int x, int y) +winSetCursor (DeviceIntPtr pDev, ScreenPtr pScreen, CursorPtr pCursor, int x, int y) { POINT ptCurPos, ptTemp; HWND hwnd; @@ -549,7 +549,7 @@ winSetCursor (ScreenPtr pScreen, CursorPtr pCursor, int x, int y) * Move the cursor. This is a noop for us. */ static void -winMoveCursor (ScreenPtr pScreen, int x, int y) +winMoveCursor (DeviceIntPtr pDev, ScreenPtr pScreen, int x, int y) { } diff --git a/xorg-server/hw/xwin/winkeybd.c b/xorg-server/hw/xwin/winkeybd.c index 1cd3e4cb3..5ac558d98 100644 --- a/xorg-server/hw/xwin/winkeybd.c +++ b/xorg-server/hw/xwin/winkeybd.c @@ -308,12 +308,24 @@ winKeybdProc (DeviceIntPtr pDeviceInt, int iState) #endif break; - case DEVICE_ON: + case DEVICE_ON: + { + DeviceIntPtr master; pDevice->on = TRUE; // immediately copy the state of this keyboard device to the VCK // (which otherwise happens lazily after the first keypress) - SwitchCoreKeyboard(pDeviceInt); + master = (!pDeviceInt->isMaster && pDeviceInt->u.master) ? pDeviceInt->u.master : NULL; + if (master) + { + /* Force a copy of the key class into the VCK so that the layout + is transferred. */ + if (!master->key) + master = GetPairedDevice(master); + CopyKeyClass(pDeviceInt, master); + } + } + break; case DEVICE_CLOSE: diff --git a/xorg-server/hw/xwin/xlaunch/window/util.cc b/xorg-server/hw/xwin/xlaunch/window/util.cc index fb7e87297..6f768348e 100644 --- a/xorg-server/hw/xwin/xlaunch/window/util.cc +++ b/xorg-server/hw/xwin/xlaunch/window/util.cc @@ -25,6 +25,8 @@ */ #include "util.h" +const char * MessageDebug::notify_names[NOTIFY_NAMES_LEN]; + std::string win32_error::message(DWORD errorcode) { LPVOID lpMsgBuf; diff --git a/xorg-server/hw/xwin/xlaunch/window/util.h b/xorg-server/hw/xwin/xlaunch/window/util.h index 2e8dab263..a1196b115 100644 --- a/xorg-server/hw/xwin/xlaunch/window/util.h +++ b/xorg-server/hw/xwin/xlaunch/window/util.h @@ -39,7 +39,7 @@ class win32_error : public std::runtime_error }; #define MESSAGE_NAMES_LEN 1024 -#define NOTIFY_NAMES_LEN 0 +#define NOTIFY_NAMES_LEN 1 class MessageDebug { protected: diff --git a/xorg-server/include/xkb-config.h b/xorg-server/include/xkb-config.h new file mode 100644 index 000000000..91c7957bf --- /dev/null +++ b/xorg-server/include/xkb-config.h @@ -0,0 +1,24 @@ +/* include/xkb-config.h. Generated from xkb-config.h.in by configure. */ +/* xkb-config.h.in: not at all generated. -*- c -*- + * + */ + +#ifndef _XKB_CONFIG_H_ +#define _XKB_CONFIG_H_ + +/* Default set of XKB rules. */ +#define __XKBDEFRULES__ "xorg" + +/* Path to XKB definitions. */ +#define XKB_BASE_DIRECTORY "xkbdata" + +/* Path to xkbcomp. */ +#define XKB_BIN_DIRECTORY "." + +/* XKB output dir for compiled keymaps. */ +#define XKM_OUTPUT_DIR "xkbdata/compiled/" + +/* Do not have `strcasecmp'. */ +/* #undef NEED_STRCASECMP */ + +#endif /* _XKB_CONFIG_H_ */ diff --git a/xorg-server/makefile b/xorg-server/makefile index d1c758e09..110645fe2 100644 --- a/xorg-server/makefile +++ b/xorg-server/makefile @@ -2,9 +2,7 @@ ifneq ($(MAKESERVER),1) $(error Please specify MAKESERVER=1 on the command line or as environment variable) endif -INCLUDELIBFILES = afb\$(OBJDIR)\libafb.lib \ - cfb\$(OBJDIR)\libcfb.lib \ - cfb32\$(OBJDIR)\libcfb32.lib \ +INCLUDELIBFILES = \ composite\$(OBJDIR)\libcomposite.lib \ config\$(OBJDIR)\libconfig.lib \ damageext\$(OBJDIR)\libdamageext.lib \ @@ -16,7 +14,6 @@ INCLUDELIBFILES = afb\$(OBJDIR)\libafb.lib \ hw\kdrive\ephyr\$(OBJDIR)\libxephyr.lib \ hw\kdrive\src\$(OBJDIR)\libkdrive.lib \ hw\xwin\$(OBJDIR)\libxwin.lib \ - mfb\$(OBJDIR)\libmfb.lib \ mi\$(OBJDIR)\libmi.lib \ miext\damage\$(OBJDIR)\libdamage.lib \ miext\shadow\$(OBJDIR)\libshadow.lib \ @@ -60,13 +57,13 @@ OBJS = dix\$(OBJDIR)\main.obj WINAPP=vcxsrv -LINKLIBS += $(MHMAKECONF)\openssl\out32\libeay32.lib - ifeq ($(DEBUG),1) -LINKLIBS += $(MHMAKECONF)\freetype\lib\freetype200b8MT_D.lib \ +LINKLIBS += $(MHMAKECONF)\openssl\out32_d\libeay32.lib \ + $(MHMAKECONF)\freetype\lib\freetype200b8MT_D.lib \ $(MHMAKECONF)\pthreads\pthreadVC2d.lib else -LINKLIBS += $(MHMAKECONF)\freetype\lib\freetype200b8MT.lib \ +LINKLIBS += $(MHMAKECONF)\openssl\out32\libeay32.lib \ + $(MHMAKECONF)\freetype\lib\freetype200b8MT.lib \ $(MHMAKECONF)\pthreads\pthreadVC2.lib endif diff --git a/xorg-server/mi/mipointer.c b/xorg-server/mi/mipointer.c index e37316e71..85cc70de0 100644 --- a/xorg-server/mi/mipointer.c +++ b/xorg-server/mi/mipointer.c @@ -285,10 +285,10 @@ miPointerDeviceInitialize(DeviceIntPtr pDev, ScreenPtr pScreen) static void miPointerDeviceCleanup(DeviceIntPtr pDev, ScreenPtr pScreen) { + SetupScreen(pScreen); if (!pDev->isMaster && pDev->u.master) return; - SetupScreen(pScreen); (*pScreenPriv->spriteFuncs->DeviceCursorCleanup)(pDev, pScreen); xfree(dixLookupPrivate(&pDev->devPrivates, miPointerPrivKey)); dixSetPrivate(&pDev->devPrivates, miPointerPrivKey, NULL); @@ -302,9 +302,9 @@ miPointerWarpCursor (DeviceIntPtr pDev, ScreenPtr pScreen, int x, int y) { miPointerPtr pPointer; BOOL changedScreen = FALSE; + SetupScreen (pScreen); pPointer = MIPOINTER(pDev); - SetupScreen (pScreen); if (pPointer->pScreen != pScreen) { diff --git a/xorg-server/mi/misprite.c b/xorg-server/mi/misprite.c index 692e6c97a..0b83abdb4 100644 --- a/xorg-server/mi/misprite.c +++ b/xorg-server/mi/misprite.c @@ -725,10 +725,10 @@ miSpriteSetCursor (DeviceIntPtr pDev, ScreenPtr pScreen, CursorPtr pCursor, int x, int y) { miSpriteScreenPtr pScreenPriv; + miCursorInfoPtr pPointer; pScreenPriv = (miSpriteScreenPtr)dixLookupPrivate(&pScreen->devPrivates, miSpriteScreenKey); - miCursorInfoPtr pPointer; if (!pDev->isMaster && !pDev->u.master) { diff --git a/xorg-server/os/connection.c b/xorg-server/os/connection.c index 8f1f73e43..9148b4ea8 100644 --- a/xorg-server/os/connection.c +++ b/xorg-server/os/connection.c @@ -111,6 +111,10 @@ SOFTWARE. #include "dixstruct.h" #include "xace.h" +#ifdef _MSC_VER +typedef int pid_t; +#endif + #define Pid_t pid_t #ifdef DNETCONN diff --git a/xorg-server/os/oscolor.c b/xorg-server/os/oscolor.c index 7f6b93880..4e1513f53 100644 --- a/xorg-server/os/oscolor.c +++ b/xorg-server/os/oscolor.c @@ -49,6 +49,10 @@ SOFTWARE. #include <dix-config.h> #endif +#ifdef _MSC_VER +#define strncasecmp _strnicmp +#endif + #include <X11/keysym.h> #include "os.h" diff --git a/xorg-server/os/osinit.c b/xorg-server/os/osinit.c index 74e2457f2..49dfe4999 100644 --- a/xorg-server/os/osinit.c +++ b/xorg-server/os/osinit.c @@ -139,8 +139,10 @@ OsInit(void) #endif } +#ifndef _MSC_VER if (getpgrp () == 0) setpgid (0, 0); +#endif #ifdef RLIMIT_DATA if (limitDataSpace >= 0) diff --git a/xorg-server/os/utils.c b/xorg-server/os/utils.c index a02b73a2b..1f37b4d9b 100644 --- a/xorg-server/os/utils.c +++ b/xorg-server/os/utils.c @@ -218,6 +218,9 @@ OsSignal(sig, handler) int sig; OsSigHandlerPtr handler; { +#ifdef X_NOT_POSIX + return signal(sig, handler); +#else struct sigaction act, oact; sigemptyset(&act.sa_mask); @@ -228,6 +231,7 @@ OsSignal(sig, handler) if (sigaction(sig, &act, &oact)) perror("sigaction"); return oact.sa_handler; +#endif } /* @@ -236,7 +240,11 @@ OsSignal(sig, handler) * server at a time. This keeps the servers from stomping on each other * if the user forgets to give them different display numbers. */ +#ifdef _MSC_VER +#define LOCK_DIR getenv("TEMP") +#else #define LOCK_DIR "/tmp" +#endif #define LOCK_TMP_PREFIX "/.tX" #define LOCK_PREFIX "/.X" #define LOCK_SUFFIX "-lock" @@ -252,8 +260,14 @@ OsSignal(sig, handler) #endif #endif +#ifdef _MSC_VER +#define kill(pid, exitcode) TerminateProcess(OpenProcess(PROCESS_TERMINATE ,FALSE,pid),exitcode) +#define link rename +#endif + + static Bool StillLocking = FALSE; -static char LockFile[PATH_MAX]; +static char szLockFile[PATH_MAX]; static Bool nolock = FALSE; /* @@ -281,10 +295,10 @@ LockServer(void) len = strlen(LOCK_PREFIX) > strlen(LOCK_TMP_PREFIX) ? strlen(LOCK_PREFIX) : strlen(LOCK_TMP_PREFIX); len += strlen(tmppath) + strlen(port) + strlen(LOCK_SUFFIX) + 1; - if (len > sizeof(LockFile)) + if (len > sizeof(szLockFile)) FatalError("Display name `%s' is too long\n", port); (void)sprintf(tmp, "%s" LOCK_TMP_PREFIX "%s" LOCK_SUFFIX, tmppath, port); - (void)sprintf(LockFile, "%s" LOCK_PREFIX "%s" LOCK_SUFFIX, tmppath, port); + (void)sprintf(szLockFile, "%s" LOCK_PREFIX "%s" LOCK_SUFFIX, tmppath, port); /* * Create a temporary file containing our PID. Attempt three times @@ -326,7 +340,7 @@ LockServer(void) i = 0; haslock = 0; while ((!haslock) && (i++ < 3)) { - haslock = (link(tmp,LockFile) == 0); + haslock = (link(tmp,szLockFile) == 0); if (haslock) { /* * We're done. @@ -337,17 +351,17 @@ LockServer(void) /* * Read the pid from the existing file */ - lfd = open(LockFile, O_RDONLY); + lfd = open(szLockFile, O_RDONLY); if (lfd < 0) { unlink(tmp); - FatalError("Can't read lock file %s\n", LockFile); + FatalError("Can't read lock file %s\n", szLockFile); } pid_str[0] = '\0'; if (read(lfd, pid_str, 11) != 11) { /* * Bogus lock file. */ - unlink(LockFile); + unlink(szLockFile); close(lfd); continue; } @@ -364,7 +378,7 @@ LockServer(void) /* * Stale lock file. */ - unlink(LockFile); + unlink(szLockFile); continue; } else if (((t < 0) && (errno == EPERM)) || (t == 0)) { @@ -374,13 +388,13 @@ LockServer(void) unlink(tmp); FatalError("Server is already active for display %s\n%s %s\n%s\n", port, "\tIf this server is no longer running, remove", - LockFile, "\tand start again."); + szLockFile, "\tand start again."); } } } unlink(tmp); if (!haslock) - FatalError("Could not create server lock file: %s\n", LockFile); + FatalError("Could not create server lock file: %s\n", szLockFile); StillLocking = FALSE; } @@ -395,7 +409,7 @@ UnlockServer(void) if (!StillLocking){ - (void) unlink(LockFile); + (void) unlink(szLockFile); } } @@ -1675,7 +1689,7 @@ Fclose(pointer iop) #endif #define MAX_ARG_LENGTH 128 -#define MAX_ENV_LENGTH 256 +#define MAX_ENV_LENGTH 2048 #define MAX_ENV_PATH_LENGTH 2048 /* Limit for *PATH and TERMCAP */ #if USE_ISPRINT diff --git a/xorg-server/randr/makefile b/xorg-server/randr/makefile index ea6fa3fde..9ec11e808 100644 --- a/xorg-server/randr/makefile +++ b/xorg-server/randr/makefile @@ -1,4 +1,16 @@ -CSRCS=mirandr.c randr.c rrcrtc.c rrdispatch.c rrinfo.c rrmode.c rroutput.c rrpointer.c rrproperty.c rrscreen.c rrsdispatch.c
-
LIBRARY=librandr
+CSRCS = \
+ mirandr.c \
+ randr.c \
+ rrcrtc.c \
+ rrdispatch.c \
+ rrinfo.c \
+ rrmode.c \
+ rroutput.c \
+ rrpointer.c \
+ rrproperty.c \
+ rrscreen.c \
+ rrsdispatch.c \
+ rrtransform.c
+
diff --git a/xorg-server/render/makefile b/xorg-server/render/makefile index 1490c7c59..dfd905a7c 100644 --- a/xorg-server/render/makefile +++ b/xorg-server/render/makefile @@ -1,4 +1,16 @@ -CSRCS=animcur.c filter.c glyph.c miindex.c mipict.c mirect.c mitrap.c mitri.c picture.c render.c renderedge.c
LIBRARY=librender
+CSRCS = \
+ animcur.c \
+ filter.c \
+ glyph.c \
+ matrix.c \
+ miindex.c \
+ mipict.c \
+ mirect.c \
+ mitrap.c \
+ mitri.c \
+ picture.c \
+ render.c \
+ renderedge.c
diff --git a/xorg-server/vcxsrv.sln b/xorg-server/vcxsrv.sln new file mode 100644 index 000000000..948ecfc63 --- /dev/null +++ b/xorg-server/vcxsrv.sln @@ -0,0 +1,16 @@ +
+Microsoft Visual Studio Solution File, Format Version 10.00
+# Visual C++ Express 2008
+Project("{8BC9CEB9-8B4A-11D0-8D11-00A0C91BC942}") = "vcxsrv.exe", "vcxsrv.exe", "{0A7F2844-C7BA-43E2-B7AE-48070F7AA1A7}"
+EndProject
+Global
+ GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ Debug|Default = Debug|Default
+ EndGlobalSection
+ GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {0A7F2844-C7BA-43E2-B7AE-48070F7AA1A7}.Debug|Default.ActiveCfg = Debug
+ EndGlobalSection
+ GlobalSection(SolutionProperties) = preSolution
+ HideSolutionNode = FALSE
+ EndGlobalSection
+EndGlobal
diff --git a/xorg-server/xkb/makefile b/xorg-server/xkb/makefile index dc1b559e0..31b3a857b 100644 --- a/xorg-server/xkb/makefile +++ b/xorg-server/xkb/makefile @@ -3,7 +3,6 @@ DEFINES += HAVE_XKB_CONFIG_H DDX_SRCS = \ ddxBeep.c \ ddxCtrls.c \ - ddxFakeBtn.c \ ddxFakeMtn.c \ ddxInit.c \ ddxKeyClick.c \ |