From d02cf3cc6e0989aace77a47a56979d1f21d33724 Mon Sep 17 00:00:00 2001 From: marha Date: Tue, 26 Jun 2012 11:14:32 +0200 Subject: libXext is now a dll --- libX11/libX11.def | 7 ++++++- libXext/src/libXext.def | 8 ++++++++ libXext/src/makefile | 5 ++++- xorg-server/installer/vcxsrv.nsi | 10 ++++++---- 4 files changed, 24 insertions(+), 6 deletions(-) create mode 100644 libXext/src/libXext.def diff --git a/libX11/libX11.def b/libX11/libX11.def index b4789899f..cb0e0bedb 100644 --- a/libX11/libX11.def +++ b/libX11/libX11.def @@ -4,11 +4,15 @@ EXPORTS _XAllocTemp _XDeqAsyncHandler _XEatData + _XFlushGCCache _XFlushIt _XFreeTemp _XGetAsyncReply + _XGetBitsPerPixel _XGetRequest + _XGetScanlinePad _Xglobal_lock_p + _XInitImageFuncPtrs _XLockMutex_fn_p _XRead _XReadPad @@ -226,6 +230,7 @@ EXPORTS XPutImage XQueryColor XQueryColors + XQueryExtension XQueryFont XQueryPointer XQueryTree @@ -334,4 +339,4 @@ EXPORTS XwcTextListToTextProperty XwcTextPropertyToTextList XWithdrawWindow - XWMGeometry + XWMGeometry \ No newline at end of file diff --git a/libXext/src/libXext.def b/libXext/src/libXext.def new file mode 100644 index 000000000..ceb636cf9 --- /dev/null +++ b/libXext/src/libXext.def @@ -0,0 +1,8 @@ +LIBRARY libXext +EXPORTS + XSecurityGenerateAuthorization + XSecurityFreeXauth + XSecurityQueryExtension + XSecurityAllocXauth + XShapeCombineMask + XShapeQueryExtension \ No newline at end of file diff --git a/libXext/src/makefile b/libXext/src/makefile index c0856e02e..d2b006416 100644 --- a/libXext/src/makefile +++ b/libXext/src/makefile @@ -1,7 +1,10 @@ -LIBRARY = libXext +SHAREDLIB = libXext INCLUDES := ..\include $(INCLUDES) +INCLUDELIBFILES = \ + $(MHMAKECONF)\libX11\$(OBJDIR)\libX11.lib + CSRCS = \ DPMS.c \ MITMisc.c \ diff --git a/xorg-server/installer/vcxsrv.nsi b/xorg-server/installer/vcxsrv.nsi index 09ad13bcf..90ec5ee5d 100644 --- a/xorg-server/installer/vcxsrv.nsi +++ b/xorg-server/installer/vcxsrv.nsi @@ -58,7 +58,7 @@ XPStyle on Section "VcXsrv (required)" SectionIn RO - SectionIn 1 2 + SectionIn 1 2 3 ; Set output path to the installation directory. SetOutPath $INSTDIR @@ -95,6 +95,7 @@ Section "VcXsrv (required)" File "..\..\libxcb\src\obj\release\libxcb.dll" File "..\..\libXau\obj\release\libXau.dll" File "..\..\libX11\obj\release\libX11.dll" + File "..\..\libXext\src\obj\release\libXext.dll" File "..\..\libxml2\bin\iconv.dll" File "msvcr100.dll" File "msvcp100.dll" @@ -145,7 +146,7 @@ SectionEnd ; Optional section (can be disabled by the user) Section "Fonts" - SectionIn 1 + SectionIn 1 3 SetOutPath $INSTDIR\fonts CreateDirectory "$SMPROGRAMS\VcXsrv" @@ -155,7 +156,7 @@ SectionEnd ; Optional section (can be disabled by the user) Section "Start Menu Shortcuts" - SectionIn 1 + SectionIn 1 3 SetOutPath $INSTDIR CreateDirectory "$SMPROGRAMS\VcXsrv" @@ -167,7 +168,7 @@ SectionEnd ; Optional section (can be disabled by the user) Section "Desktop Shortcuts" - SectionIn 1 + SectionIn 1 3 SetOutPath $INSTDIR CreateShortCut "$DESKTOP\VcXsrv.lnk" "$INSTDIR\vcxsrv.exe" " :0 -ac -terminate -lesspointer -multiwindow -clipboard -wgl" "$INSTDIR\vcxsrv.exe" 0 @@ -257,6 +258,7 @@ Section "Uninstall" Delete "$INSTDIR\libxcb.dll" Delete "$INSTDIR\libXau.dll" Delete "$INSTDIR\libX11.dll" + Delete "$INSTDIR\libXext.dll" Delete "$INSTDIR\libxml2.dll" Delete "$INSTDIR\zlib1.dll" Delete "$INSTDIR\iconv.dll" -- cgit v1.2.3