aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/installer/vcxsrv.nsi
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2012-06-26 11:14:32 +0200
committermarha <marha@users.sourceforge.net>2012-06-26 11:14:32 +0200
commitd02cf3cc6e0989aace77a47a56979d1f21d33724 (patch)
tree37af2a9a8ff2e63f9d982dd3c6ff7a0bdcb73a6e /xorg-server/installer/vcxsrv.nsi
parent3458e8f13f8389a146c5b54b145dfb586af98dce (diff)
downloadvcxsrv-d02cf3cc6e0989aace77a47a56979d1f21d33724.tar.gz
vcxsrv-d02cf3cc6e0989aace77a47a56979d1f21d33724.tar.bz2
vcxsrv-d02cf3cc6e0989aace77a47a56979d1f21d33724.zip
libXext is now a dll
Diffstat (limited to 'xorg-server/installer/vcxsrv.nsi')
-rw-r--r--xorg-server/installer/vcxsrv.nsi10
1 files changed, 6 insertions, 4 deletions
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"