From 8fd115adc568833cdb5af22b65a09c38e0eac20f Mon Sep 17 00:00:00 2001 From: marha Date: Tue, 26 Jun 2012 08:56:57 +0200 Subject: libX11 is now compiled as dll --- apps/xauth/makefile | 10 +- apps/xcalc/makefile | 12 +- apps/xclock/makefile | 13 +- apps/xhost/makefile | 10 +- apps/xwininfo/makefile | 11 +- bdftopcf/makefile | 2 +- libX11/libX11.def | 337 +++++++++++++++++++++++++++++++++++ libX11/src/makefile | 2 +- libXt/src/makefile | 2 +- libxcb/src/makefile.srcs | 2 + makefile.after | 2 + mkfontscale/makefile | 2 +- xkbcomp/makefile | 12 +- xorg-server/hw/xwin/xlaunch/makefile | 14 +- xorg-server/installer/vcxsrv.nsi | 1 + xorg-server/makefile | 14 +- 16 files changed, 360 insertions(+), 86 deletions(-) create mode 100644 libX11/libX11.def diff --git a/apps/xauth/makefile b/apps/xauth/makefile index 235a5d46e..fbe2337c0 100644 --- a/apps/xauth/makefile +++ b/apps/xauth/makefile @@ -2,19 +2,11 @@ TTYAPP = xauth INCLUDELIBFILES = \ ..\common\$(OBJDIR)\common.lib \ - $(MHMAKECONF)\libX11\src\xkb\$(OBJDIR)\libxkb.lib \ - $(MHMAKECONF)\libX11\src\xlibi18n\$(OBJDIR)\libi18n.lib \ - $(MHMAKECONF)\libX11\modules\lc\xlocale\$(OBJDIR)\libxlocale.lib \ - $(MHMAKECONF)\libX11\modules\lc\utf8\$(OBJDIR)\libxlcUTF8Load.lib \ - $(MHMAKECONF)\libX11\modules\lc\def\$(OBJDIR)\libxlcDef.lib \ - $(MHMAKECONF)\libX11\modules\om\generic\$(OBJDIR)\libxomGeneric.lib \ - $(MHMAKECONF)\libX11\modules\lc\gen\$(OBJDIR)\liblcGenConvLoad.lib \ - $(MHMAKECONF)\libX11\modules\im\ximcp\$(OBJDIR)\libximcp.lib \ $(MHMAKECONF)\libxcb\src\$(OBJDIR)\libxcb.lib \ $(MHMAKECONF)\libxau\$(OBJDIR)\libXau.lib \ $(MHMAKECONF)\libXmu\src\$(OBJDIR)\libXmu.lib \ $(MHMAKECONF)\libXext\src\$(OBJDIR)\libXext.lib \ - $(MHMAKECONF)\libX11\src\$(OBJDIR)\libx11.lib \ + $(MHMAKECONF)\libX11\$(OBJDIR)\libX11.lib LIBDIRS=$(dir $(INCLUDELIBFILES)) diff --git a/apps/xcalc/makefile b/apps/xcalc/makefile index 27e159173..a4deb34cc 100644 --- a/apps/xcalc/makefile +++ b/apps/xcalc/makefile @@ -3,15 +3,6 @@ WINAPP = xcalc DEFINES += XT_NO_SM IEEE INCLUDELIBFILES = \ - $(MHMAKECONF)\libX11\src\xkb\$(OBJDIR)\libxkb.lib \ - $(MHMAKECONF)\libX11\src\xcms\$(OBJDIR)\libxcms.lib \ - $(MHMAKECONF)\libX11\src\xlibi18n\$(OBJDIR)\libi18n.lib \ - $(MHMAKECONF)\libX11\modules\lc\xlocale\$(OBJDIR)\libxlocale.lib \ - $(MHMAKECONF)\libX11\modules\lc\utf8\$(OBJDIR)\libxlcUTF8Load.lib \ - $(MHMAKECONF)\libX11\modules\lc\def\$(OBJDIR)\libxlcDef.lib \ - $(MHMAKECONF)\libX11\modules\om\generic\$(OBJDIR)\libxomGeneric.lib \ - $(MHMAKECONF)\libX11\modules\lc\gen\$(OBJDIR)\liblcGenConvLoad.lib \ - $(MHMAKECONF)\libX11\modules\im\ximcp\$(OBJDIR)\libximcp.lib \ $(MHMAKECONF)\libxcb\src\$(OBJDIR)\libxcb.lib \ $(MHMAKECONF)\libXpm\src\$(OBJDIR)\libXpm.lib \ $(MHMAKECONF)\libxau\$(OBJDIR)\libXau.lib \ @@ -19,7 +10,8 @@ INCLUDELIBFILES = \ $(MHMAKECONF)\libXt\src\$(OBJDIR)\libXt.lib \ $(MHMAKECONF)\libXext\src\$(OBJDIR)\libXext.lib \ $(MHMAKECONF)\libXmu\src\$(OBJDIR)\libXmu.lib \ - $(MHMAKECONF)\libX11\src\$(OBJDIR)\libX11.lib + $(MHMAKECONF)\libX11\$(OBJDIR)\libX11.lib + LIBDIRS=$(dir $(INCLUDELIBFILES)) load_makefile $(LIBDIRS:%$(OBJDIR)\=%makefile MAKESERVER=0 DEBUG=$(DEBUG);) diff --git a/apps/xclock/makefile b/apps/xclock/makefile index 99a8c4c81..2f0381b6a 100644 --- a/apps/xclock/makefile +++ b/apps/xclock/makefile @@ -3,15 +3,6 @@ WINAPP = xclock DEFINES += XT_NO_SM XRENDER INCLUDELIBFILES = \ - $(MHMAKECONF)\libX11\src\xkb\$(OBJDIR)\libxkb.lib \ - $(MHMAKECONF)\libX11\src\xcms\$(OBJDIR)\libxcms.lib \ - $(MHMAKECONF)\libX11\src\xlibi18n\$(OBJDIR)\libi18n.lib \ - $(MHMAKECONF)\libX11\modules\lc\xlocale\$(OBJDIR)\libxlocale.lib \ - $(MHMAKECONF)\libX11\modules\lc\utf8\$(OBJDIR)\libxlcUTF8Load.lib \ - $(MHMAKECONF)\libX11\modules\lc\def\$(OBJDIR)\libxlcDef.lib \ - $(MHMAKECONF)\libX11\modules\om\generic\$(OBJDIR)\libxomGeneric.lib \ - $(MHMAKECONF)\libX11\modules\lc\gen\$(OBJDIR)\liblcGenConvLoad.lib \ - $(MHMAKECONF)\libX11\modules\im\ximcp\$(OBJDIR)\libximcp.lib \ $(MHMAKECONF)\libxcb\src\$(OBJDIR)\libxcb.lib \ $(MHMAKECONF)\libxkbfile\src\$(OBJDIR)\libxkbfile.lib \ $(MHMAKECONF)\libXpm\src\$(OBJDIR)\libXpm.lib \ @@ -20,12 +11,12 @@ INCLUDELIBFILES = \ $(MHMAKECONF)\libXt\src\$(OBJDIR)\libXt.lib \ $(MHMAKECONF)\libXext\src\$(OBJDIR)\libXext.lib \ $(MHMAKECONF)\libXmu\src\$(OBJDIR)\libXmu.lib \ - $(MHMAKECONF)\libX11\src\$(OBJDIR)\libX11.lib \ + $(MHMAKECONF)\libX11\$(OBJDIR)\libX11.lib \ $(MHMAKECONF)\libXft\src\$(OBJDIR)\libXft.lib \ $(MHMAKECONF)\libXrender\src\$(OBJDIR)\libXrender.lib \ $(MHMAKECONF)\fontconfig\src\$(OBJDIR)\libfontconfig.lib \ $(MHMAKECONF)\libXfont\src\util\$(OBJDIR)\libutil.lib - + INCLUDES += $(MHMAKECONF)\libXft\include $(MHMAKECONF)\freetype\include $(MHMAKECONF)\fontconfig LIBDIRS=$(dir $(INCLUDELIBFILES)) diff --git a/apps/xhost/makefile b/apps/xhost/makefile index 2461a488d..023fdc01b 100644 --- a/apps/xhost/makefile +++ b/apps/xhost/makefile @@ -4,18 +4,10 @@ TTYAPP = xhost INCLUDELIBFILES = \ ..\common\$(OBJDIR)\common.lib \ - $(MHMAKECONF)\libX11\src\xkb\$(OBJDIR)\libxkb.lib \ - $(MHMAKECONF)\libX11\src\xlibi18n\$(OBJDIR)\libi18n.lib \ - $(MHMAKECONF)\libX11\modules\lc\xlocale\$(OBJDIR)\libxlocale.lib \ - $(MHMAKECONF)\libX11\modules\lc\utf8\$(OBJDIR)\libxlcUTF8Load.lib \ - $(MHMAKECONF)\libX11\modules\lc\def\$(OBJDIR)\libxlcDef.lib \ - $(MHMAKECONF)\libX11\modules\om\generic\$(OBJDIR)\libxomGeneric.lib \ - $(MHMAKECONF)\libX11\modules\lc\gen\$(OBJDIR)\liblcGenConvLoad.lib \ - $(MHMAKECONF)\libX11\modules\im\ximcp\$(OBJDIR)\libximcp.lib \ $(MHMAKECONF)\libxcb\src\$(OBJDIR)\libxcb.lib \ $(MHMAKECONF)\libxau\$(OBJDIR)\libXau.lib \ $(MHMAKECONF)\libXmu\src\$(OBJDIR)\libXmu.lib \ - $(MHMAKECONF)\libX11\src\$(OBJDIR)\libx11.lib \ + $(MHMAKECONF)\libX11\$(OBJDIR)\libX11.lib \ LIBDIRS=$(dir $(INCLUDELIBFILES)) diff --git a/apps/xwininfo/makefile b/apps/xwininfo/makefile index 81c1eaf54..91770da3a 100644 --- a/apps/xwininfo/makefile +++ b/apps/xwininfo/makefile @@ -1,19 +1,10 @@ TTYAPP = xwininfo INCLUDELIBFILES = \ - $(MHMAKECONF)\libX11\src\xkb\$(OBJDIR)\libxkb.lib \ - $(MHMAKECONF)\libX11\src\xcms\$(OBJDIR)\libxcms.lib \ - $(MHMAKECONF)\libX11\src\xlibi18n\$(OBJDIR)\libi18n.lib \ - $(MHMAKECONF)\libX11\modules\lc\xlocale\$(OBJDIR)\libxlocale.lib \ - $(MHMAKECONF)\libX11\modules\lc\utf8\$(OBJDIR)\libxlcUTF8Load.lib \ - $(MHMAKECONF)\libX11\modules\lc\def\$(OBJDIR)\libxlcDef.lib \ - $(MHMAKECONF)\libX11\modules\om\generic\$(OBJDIR)\libxomGeneric.lib \ - $(MHMAKECONF)\libX11\modules\lc\gen\$(OBJDIR)\liblcGenConvLoad.lib \ - $(MHMAKECONF)\libX11\modules\im\ximcp\$(OBJDIR)\libximcp.lib \ $(MHMAKECONF)\libxcb\src\$(OBJDIR)\libxcb.lib \ $(MHMAKECONF)\libxau\$(OBJDIR)\libXau.lib \ $(MHMAKECONF)\libXext\src\$(OBJDIR)\libXext.lib \ - $(MHMAKECONF)\libX11\src\$(OBJDIR)\libx11.lib + $(MHMAKECONF)\libX11\$(OBJDIR)\libX11.lib LIBDIRS=$(dir $(INCLUDELIBFILES)) diff --git a/bdftopcf/makefile b/bdftopcf/makefile index 81986617f..e9a8abf33 100644 --- a/bdftopcf/makefile +++ b/bdftopcf/makefile @@ -8,7 +8,7 @@ INCLUDELIBFILES = \ LIBDIRS=$(dir $(INCLUDELIBFILES)) -load_makefile $(LIBDIRS:%$(OBJDIR)\=%makefile MAKESERVER=$(MAKESERVER) DEBUG=$(DEBUG);) +load_makefile $(LIBDIRS:%$(OBJDIR)\=%makefile MAKESERVER=0 DEBUG=$(DEBUG);) CSRCS = bdftopcf.c diff --git a/libX11/libX11.def b/libX11/libX11.def new file mode 100644 index 000000000..b4789899f --- /dev/null +++ b/libX11/libX11.def @@ -0,0 +1,337 @@ +LIBRARY libX11 +EXPORTS + _XAllocScratch + _XAllocTemp + _XDeqAsyncHandler + _XEatData + _XFlushIt + _XFreeTemp + _XGetAsyncReply + _XGetRequest + _Xglobal_lock_p + _XLockMutex_fn_p + _XRead + _XReadPad + _XReply + _XSend + _XSetLastRequestRead + _Xsetlocale + _XUnlockMutex_fn_p + _XVIDtoVisual + XAddConnectionWatch + XAddExtension + XAddHost + XAllocColor + XAllocIconSize + XAllocNamedColor + XAllocSizeHints + XBell + XChangeGC + XChangeProperty + XChangeWindowAttributes + XCheckIfEvent + XClearArea + XClipBox + XCloseDisplay + XCloseIM + XConfigureWindow + XConvertCase + XConvertSelection + XCopyArea + XCopyPlane + XCreateBitmapFromData + XCreateFontCursor + XCreateFontSet + XCreateGC + XCreateGlyphCursor + XCreateIC + XCreateImage + XCreatePixmap + XCreatePixmapCursor + XCreatePixmapFromBitmapData + XCreateRegion + XCreateSimpleWindow + XCreateWindow + XDefaultColormap + XDefaultDepth + XDefaultScreen + XDefaultVisual + XDefineCursor + XDeleteContext + XDeleteProperty + XDestroyIC + XDestroyRegion + XDestroyWindow + XDisableAccessControl + XDisplayKeycodes + XDisplayName + XDisplayOfIM + XDisplayOfScreen + XDrawArc + XDrawArcs + XDrawImageString + XDrawLine + XDrawLines + XDrawPoint + XDrawPoints + XDrawRectangle + XDrawSegments + XDrawString + XDrawString16 + XEmptyRegion + XEnableAccessControl + XEqualRegion + XESetCloseDisplay + XESetCopyGC + XESetCreateFont + XESetCreateGC + XESetError + XESetErrorString + XESetEventToWire + XESetFlushGC + XESetFreeFont + XESetFreeGC + XESetWireToEvent + XEventsQueued + XExtentsOfFontSet + XFetchBuffer + XFetchName + XFillArc + XFillArcs + XFillPolygon + XFillRectangle + XFillRectangles + XFilterEvent + XFindContext + XFlush + XFontsOfFontSet + XFree + XFreeColors + XFreeCursor + XFreeFont + XFreeFontSet + XFreeGC + XFreeModifiermap + XFreePixmap + XFreeStringList + XGContextFromGC + XGetAtomName + XGetClassHint + XGetDefault + XGetErrorDatabaseText + XGetErrorText + XGetFontProperty + XGetGCValues + XGetGeometry + XGetICValues + XGetImage + XGetIMValues + XGetInputFocus + XGetKeyboardMapping + XGetModifierMapping + XGetSelectionOwner + XGetVisualInfo + XGetWindowAttributes + XGetWindowProperty + XGetWMName + XGetWMNormalHints + XGetWMProtocols + XGrabButton + XGrabKey + XGrabKeyboard + XGrabPointer + XGrabServer + XIconifyWindow + XIfEvent + XInitExtension + XInitThreads + XInternAtom + XInternAtoms + XIntersectRegion + XkbAddGeomColor + XkbAddGeomDoodad + XkbAddGeomKey + XkbAddGeomOutline + XkbAddGeomOverlay + XkbAddGeomOverlayRow + XkbAddGeomProperty + XkbAddGeomRow + XkbAddGeomSection + XkbAddGeomShape + XkbAllocClientMap + XkbAllocCompatMap + XkbAllocControls + XkbAllocGeometry + XkbAllocGeomKeyAliases + XkbAllocIndicatorMaps + XkbAllocKeyboard + XkbAllocNames + XkbAllocServerMap + XkbBell + XkbBellEvent + XkbComputeEffectiveMap + XkbComputeSectionBounds + XkbComputeShapeBounds + XkbGetCompatMap + XkbGetControls + XkbGetGeometry + XkbGetIndicatorMap + XkbGetMap + XkbGetNames + XkbGetUpdatedMap + XkbInitCanonicalKeyTypes + XkbLibraryVersion + XkbLookupKeySym + XkbOpenDisplay + XkbResizeKeyActions + XkbResizeKeySyms + XkbSetCompatMap + XkbSetGeometry + XkbSetIndicatorMap + XkbSetMap + XkbSetNames + XkbVirtualModsToReal + XKeysymToString + XKillClient + XListDepths + XListHosts + XListPixmapFormats + XLoadFont + XLoadQueryFont + XLookupColor + XLookupString + XLowerWindow + XMapRaised + XMapSubwindows + XMapWindow + XMatchVisualInfo + XMaxRequestSize + XmbDrawImageString + XmbDrawString + XmbLookupString + XmbTextEscapement + XmbTextListToTextProperty + XmbTextPropertyToTextList + XMoveResizeWindow + XNextEvent + XNextRequest + XOpenDisplay + XOpenIM + XParseColor + XPeekEvent + XPeekIfEvent + XPending + XProcessInternalConnection + XPutBackEvent + XPutImage + XQueryColor + XQueryColors + XQueryFont + XQueryPointer + XQueryTree + XRaiseWindow + XReadBitmapFileData + XRecolorCursor + XRectInRegion + XRefreshKeyboardMapping + XRemoveHost + XResourceManagerString + XrmCombineDatabase + XrmCombineFileDatabase + XrmDestroyDatabase + XrmEnumerateDatabase + XrmGetDatabase + XrmGetFileDatabase + XrmGetResource + XrmGetStringDatabase + XrmInitialize + XrmMergeDatabases + XrmParseCommand + XrmPermStringToQuark + XrmPutLineResource + XrmPutStringResource + XrmQGetResource + XrmQGetSearchList + XrmQGetSearchResource + XrmQPutResource + XrmQuarkToString + XrmSetDatabase + XrmStringToBindingQuarkList + XrmStringToQuark + XrmUniqueQuark + XRotateBuffers + XSaveContext + XScreenNumberOfScreen + XScreenResourceString + XSelectInput + XSendEvent + XSetArcMode + XSetAuthorization + XSetBackground + XSetClipMask + XSetClipOrigin + XSetClipRectangles + XSetCommand + XSetDashes + XSetErrorHandler + XSetFillRule + XSetFillStyle + XSetFont + XSetForeground + XSetFunction + XSetGraphicsExposures + XSetICFocus + XSetIconSizes + XSetICValues + XSetInputFocus + XSetIOErrorHandler + XSetLocaleModifiers + XSetPlaneMask + XSetRegion + XSetSelectionOwner + XSetStipple + XSetSubwindowMode + XSetTile + XSetTransientForHint + XSetTSOrigin + XSetWindowBorder + XSetWindowBorderPixmap + XSetWindowBorderWidth + XSetWMHints + XSetWMIconName + XSetWMName + XSetWMNormalHints + XSetWMProperties + XSetWMProtocols + XStoreName + XStringToKeysym + XSubtractRegion + XSupportsLocale + XSync + XSynchronize + XTextWidth + XTextWidth16 + XTranslateCoordinates + XUndefineCursor + XUngrabButton + XUngrabKey + XUngrabKeyboard + XUngrabPointer + XUngrabServer + XUnionRectWithRegion + XUnionRegion + XUnloadFont + XUnmapWindow + XUnsetICFocus + Xutf8TextListToTextProperty + Xutf8TextPropertyToTextList + XVaCreateNestedList + XwcDrawImageString + XwcDrawString + XwcFreeStringList + XwcLookupString + XwcTextEscapement + XwcTextListToTextProperty + XwcTextPropertyToTextList + XWithdrawWindow + XWMGeometry diff --git a/libX11/src/makefile b/libX11/src/makefile index 6d87da17e..4d74b854e 100644 --- a/libX11/src/makefile +++ b/libX11/src/makefile @@ -268,7 +268,7 @@ INCLUDES := . xcms xlibi18n xkb $(MHMAKECONF)\X11 $(OBJDIR) $(INCLUDES) KEYSYMDEF = $(MHMAKECONF)/X11/keysymdef.h -load_makefile util\makefile MAKESERVER=$(MAKESERVER) DEBUG=$(DEBUG) +load_makefile util\makefile MAKESERVER=0 DEBUG=$(DEBUG) $(OBJDIR)\ks_tables.h: $(KEYSYMDEF) util\$(OBJDIR)\makekeys.exe util\$(OBJDIR)\makekeys $(relpath $<) > $(relpath $@) diff --git a/libXt/src/makefile b/libXt/src/makefile index a129f418b..926454034 100644 --- a/libXt/src/makefile +++ b/libXt/src/makefile @@ -68,7 +68,7 @@ STRING_LIST = ../util/string.list $(BUILT_HEADER): $(BUILT_SOURCE) -load_makefile ../util/makefile DEBUG=$(DEBUG) MAKESERVER=0 +load_makefile ../util/makefile MAKESERVER=0 DEBUG=$(DEBUG) $(BUILT_SOURCE) $(BUILT_HEADER) : ../util/$(OBJDIR)/makestrs.exe $(STRING_LIST) ../util/StrDefs.ht ../util/StrDefs.ct ../util/Shell.ht ../util/$(OBJDIR)/makestrs -i .. $(STRINGSABIOPTIONS) < $(STRING_LIST) > StringDefs.c diff --git a/libxcb/src/makefile.srcs b/libxcb/src/makefile.srcs index 2d4846a89..d91835aeb 100644 --- a/libxcb/src/makefile.srcs +++ b/libxcb/src/makefile.srcs @@ -11,3 +11,5 @@ XCBPROTO_XCBINCLUDEDIR = ..\xcb-proto\src %.c: $(XCBPROTO_XCBINCLUDEDIR)\%.xml python c_client.py -p $(XCBPROTO_XCBPYTHONDIR) $< +CLEANRULEPOSTFIX=noobjs + diff --git a/makefile.after b/makefile.after index cef71b839..d6a1170a1 100644 --- a/makefile.after +++ b/makefile.after @@ -79,6 +79,7 @@ COMMONCFLAGS += $(DEFINES:%=-D%) $(INCLUDES:%=-I%) -Fo$(relpath $@) -Fd"$(PDB)" #PDB= # There is no PDB file generated in a release build endif +ifndef CLEANRULEPOSTFIX ifeq ($(OBJDIRPREFIX),) ifeq ($(DEBUG),1) CLEANRULEPOSTFIX=debug @@ -88,6 +89,7 @@ endif else CLEANRULEPOSTFIX=$(OBJDIRPREFIX) endif +endif .PHONY: all cleanall clean clean$(CLEANRULEPOSTFIX) diff --git a/mkfontscale/makefile b/mkfontscale/makefile index ff1c44887..fc4b5a7b7 100644 --- a/mkfontscale/makefile +++ b/mkfontscale/makefile @@ -12,7 +12,7 @@ INCLUDELIBFILES = \ LIBDIRS=$(dir $(INCLUDELIBFILES)) -load_makefile $(LIBDIRS:%$(OBJDIR)\=%makefile MAKESERVER=$(MAKESERVER) DEBUG=$(DEBUG);) +load_makefile $(LIBDIRS:%$(OBJDIR)\=%makefile MAKESERVER=0 DEBUG=$(DEBUG);) CSRCS = hash.c \ ident.c \ diff --git a/xkbcomp/makefile b/xkbcomp/makefile index 298d795a6..f739de1f8 100644 --- a/xkbcomp/makefile +++ b/xkbcomp/makefile @@ -1,19 +1,11 @@ -INCLUDELIBFILES = $(MHMAKECONF)\libx11\src\$(OBJDIR)\libx11.lib \ - $(MHMAKECONF)\libx11\src\xkb\$(OBJDIR)\libxkb.lib \ - $(MHMAKECONF)\libx11\src\xlibi18n\$(OBJDIR)\libi18n.lib \ - $(MHMAKECONF)\libx11\modules\lc\xlocale\$(OBJDIR)\libxlocale.lib \ - $(MHMAKECONF)\libx11\modules\lc\utf8\$(OBJDIR)\libxlcUTF8Load.lib \ - $(MHMAKECONF)\libx11\modules\lc\def\$(OBJDIR)\libxlcDef.lib \ - $(MHMAKECONF)\libx11\modules\om\generic\$(OBJDIR)\libxomGeneric.lib \ - $(MHMAKECONF)\libx11\modules\lc\gen\$(OBJDIR)\liblcGenConvLoad.lib \ - $(MHMAKECONF)\libx11\modules\im\ximcp\$(OBJDIR)\libximcp.lib \ +INCLUDELIBFILES = $(MHMAKECONF)\libX11\$(OBJDIR)\libX11.lib \ $(MHMAKECONF)\libxcb\src\$(OBJDIR)\libxcb.lib \ $(MHMAKECONF)\libxau\$(OBJDIR)\libxau.lib \ $(MHMAKECONF)\libxkbfile\src\$(OBJDIR)\libxkbfile.lib LIBDIRS=$(dir $(INCLUDELIBFILES)) -load_makefile $(LIBDIRS:%$(OBJDIR)\=%makefile MAKESERVER=$(MAKESERVER) DEBUG=$(DEBUG);) +load_makefile $(LIBDIRS:%$(OBJDIR)\=%makefile MAKESERVER=0 DEBUG=$(DEBUG);) ifeq $(DEBUG),1 TTYAPP = xkbcomp diff --git a/xorg-server/hw/xwin/xlaunch/makefile b/xorg-server/hw/xwin/xlaunch/makefile index 7c6c27dd6..98656e57e 100644 --- a/xorg-server/hw/xwin/xlaunch/makefile +++ b/xorg-server/hw/xwin/xlaunch/makefile @@ -1,15 +1,7 @@ INCLUDELIBFILES = window\$(OBJDIR)\window.lib \ - $(MHMAKECONF)\libX11\src\$(OBJDIR)\libx11.lib \ + $(MHMAKECONF)\libX11\$(OBJDIR)\libX11.lib \ $(MHMAKECONF)\libxcb\src\$(OBJDIR)\libxcb.lib \ - $(MHMAKECONF)\libXau\$(OBJDIR)\libXau.lib \ - $(MHMAKECONF)\libX11\src\xlibi18n\$(OBJDIR)\libi18n.lib \ - $(MHMAKECONF)\libX11\modules\lc\xlocale\$(OBJDIR)\libxlocale.lib \ - $(MHMAKECONF)\libX11\modules\lc\utf8\$(OBJDIR)\libxlcUTF8Load.lib \ - $(MHMAKECONF)\libX11\modules\lc\gen\$(OBJDIR)\liblcGenConvLoad.lib \ - $(MHMAKECONF)\libX11\modules\lc\def\$(OBJDIR)\libxlcDef.lib \ - $(MHMAKECONF)\libX11\src\xkb\$(OBJDIR)\libxkb.lib \ - $(MHMAKECONF)\libX11\modules\im\ximcp\$(OBJDIR)\libximcp.lib \ - $(MHMAKECONF)\libX11\modules\om\generic\$(OBJDIR)\libxomGeneric.lib + $(MHMAKECONF)\libXau\$(OBJDIR)\libXau.lib CSRCS=config.cc main.cc @@ -24,7 +16,7 @@ $(OBJDIR)\%.res : resources\%.rc $(wildcard resources\*.rc) LIBDIRS=$(dir $(INCLUDELIBFILES)) -load_makefile $(LIBDIRS:%$(OBJDIR)\=%makefile MAKESERVER=$(MAKESERVER) DEBUG=$(DEBUG);) +load_makefile $(LIBDIRS:%$(OBJDIR)\=%makefile MAKESERVER=0 DEBUG=$(DEBUG);) LINKLIBS += $(MHMAKECONF)\libxml2\lib\libxml2.lib diff --git a/xorg-server/installer/vcxsrv.nsi b/xorg-server/installer/vcxsrv.nsi index 4286a9151..b9fcc61c3 100644 --- a/xorg-server/installer/vcxsrv.nsi +++ b/xorg-server/installer/vcxsrv.nsi @@ -100,6 +100,7 @@ Section "VcXsrv (required)" File "..\..\libxml2\bin\libxml2.dll" File "..\..\zlib\obj\release\zlib1.dll" File "..\..\libXau\obj\release\libXau.dll" + File "..\..\libX11\obj\release\libX11.dll" File "..\..\libxml2\bin\iconv.dll" !ifndef VS2008 File "msvcr100.dll" diff --git a/xorg-server/makefile b/xorg-server/makefile index 2d3eac036..55fbd6ef8 100644 --- a/xorg-server/makefile +++ b/xorg-server/makefile @@ -27,16 +27,7 @@ INCLUDELIBFILES = \ render\$(OBJDIR)\librender.lib \ INCLUDENOSERVLIBFILES = \ - $(MHMAKECONF)\libX11\modules\im\ximcp\$(NOSERVOBJDIR)\libximcp.lib \ - $(MHMAKECONF)\libX11\src\xlibi18n\$(NOSERVOBJDIR)\libi18n.lib \ - $(MHMAKECONF)\libX11\src\$(NOSERVOBJDIR)\libx11.lib \ - $(MHMAKECONF)\libX11\src\xcms\$(NOSERVOBJDIR)\libxcms.lib \ - $(MHMAKECONF)\libX11\src\xkb\$(NOSERVOBJDIR)\libxkb.lib \ - $(MHMAKECONF)\libX11\modules\om\generic\$(NOSERVOBJDIR)\libxomGeneric.lib \ - $(MHMAKECONF)\libX11\modules\lc\utf8\$(NOSERVOBJDIR)\libxlcUTF8Load.lib \ - $(MHMAKECONF)\libX11\modules\lc\def\$(NOSERVOBJDIR)\libxlcDef.lib \ - $(MHMAKECONF)\libX11\modules\lc\gen\$(NOSERVOBJDIR)\liblcGenConvLoad.lib \ - $(MHMAKECONF)\libX11\modules\lc\xlocale\$(NOSERVOBJDIR)\libxlocale.lib \ + $(MHMAKECONF)\libX11\$(NOSERVOBJDIR)\libX11.lib \ $(MHMAKECONF)\libxcb\src\$(NOSERVOBJDIR)\libxcb.lib \ $(MHMAKECONF)\pixman\pixman\$(NOSERVOBJDIR)\libpixman-1.lib \ $(MHMAKECONF)\libXdmcp\$(NOSERVOBJDIR)\libXdmcp.lib \ @@ -133,12 +124,11 @@ load_makefile ..\tools\plink\makefile MAKESERVER=0 DEBUG=0 plink.exe: ..\tools\plink\obj\release\plink.exe copy $< $@ -load_makefile ..\libX11\nls\makefile MAKESERVER=0 DEBUG=0 load_makefile fonts.src\makefile MAKESERVER=0 DEBUG=0 load_makefile xkeyboard-config\makefile MAKESERVER=0 DEBUG=0 all: $(APP).exe xlaunch.exe xkbcomp.exe protocol.txt XErrorDB xhost.exe xauth.exe \ - ..\libX11\nls\all fonts.src\all xkeyboard-config\all plink.exe xclock.exe xcalc.exe \ + fonts.src\all xkeyboard-config\all plink.exe xclock.exe xcalc.exe \ xwininfo.exe swrast_dri_dbg.dll swrast_dri.dll dxtn.dll dxtn_dbg.dll \ swrastwgl_dri.dll swrastwgl_dri_dbg.dll -- cgit v1.2.3