aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/installer/vcxsrv.nsi
diff options
context:
space:
mode:
Diffstat (limited to 'xorg-server/installer/vcxsrv.nsi')
-rw-r--r--xorg-server/installer/vcxsrv.nsi6
1 files changed, 5 insertions, 1 deletions
diff --git a/xorg-server/installer/vcxsrv.nsi b/xorg-server/installer/vcxsrv.nsi
index 62516db5b..fe2492a0f 100644
--- a/xorg-server/installer/vcxsrv.nsi
+++ b/xorg-server/installer/vcxsrv.nsi
@@ -65,6 +65,10 @@ Section "VcXsrv (required)"
; Set output path to the installation directory.
SetOutPath $INSTDIR
+ ; Remove old opengl32.dll file if it extits
+ IfFileExists "$INSTDIR\opengl32.dll" 0 +2
+ Delete "$INSTDIR\opengl32.dll"
+
; Put files there
File "..\obj\servrelease\vcxsrv.exe"
File "..\obj\servdebug\vcxsrv_dbg.exe"
@@ -81,7 +85,7 @@ Section "VcXsrv (required)"
File "..\XErrorDB"
File "..\hw\xwin\xlaunch\obj\release\xlaunch.exe"
File "..\..\tools\plink\obj\release\plink.exe"
- File "..\..\mesalib\windows\VC8\mesa\Release\opengl32.dll"
+ File "..\..\mesalib\windows\VC8\mesa\Release\mesaopengl32.dll"
File "..\..\mesalib\windows\VC8\mesa\Release\swrast_dri.dll"
SetOutPath $INSTDIR\fonts
File /r "..\fonts\*.*"