diff options
| author | marha <marha@users.sourceforge.net> | 2009-11-20 13:01:45 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2009-11-20 13:01:45 +0000 |
| commit | d2d9977f1153b5222b34859a2cb22b957bfe3221 (patch) | |
| tree | a732c0c90bbd06bbf003e23a3ec08300e154a51d /xorg-server/installer | |
| parent | da051c6af428703e746c6a1677e1dce032b86c41 (diff) | |
| download | vcxsrv-d2d9977f1153b5222b34859a2cb22b957bfe3221.tar.gz vcxsrv-d2d9977f1153b5222b34859a2cb22b957bfe3221.tar.bz2 vcxsrv-d2d9977f1153b5222b34859a2cb22b957bfe3221.zip | |
Native glx is compiling and running now (although no acceleration is happening... to be investigated further)
Diffstat (limited to 'xorg-server/installer')
| -rw-r--r-- | xorg-server/installer/vcxsrv.nsi | 6 |
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\*.*"
|