From d2d9977f1153b5222b34859a2cb22b957bfe3221 Mon Sep 17 00:00:00 2001 From: marha Date: Fri, 20 Nov 2009 13:01:45 +0000 Subject: Native glx is compiling and running now (although no acceleration is happening... to be investigated further) --- xorg-server/installer/vcxsrv.nsi | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'xorg-server/installer/vcxsrv.nsi') 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\*.*" -- cgit v1.2.3