aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--building.txt5
-rw-r--r--xorg-server/installer/vcxsrv.nsi2
2 files changed, 6 insertions, 1 deletions
diff --git a/building.txt b/building.txt
index cac110ddb..54f2ee543 100644
--- a/building.txt
+++ b/building.txt
@@ -22,6 +22,11 @@ Building pthreads:
- run 'nmake VC-static'
- run 'nmake VC-static-debug'
+Building mesa
+- goto mesalib\windows\VC8\mesa
+- open mesa.sln
+- Build configuration 'Release'
+
Building mhmake
- open tools\mhmake\mhmake.sln in Visual C++ 2008 Express Edition
- Build the Debug and Release configurations
diff --git a/xorg-server/installer/vcxsrv.nsi b/xorg-server/installer/vcxsrv.nsi
index efbdb8114..058b0be62 100644
--- a/xorg-server/installer/vcxsrv.nsi
+++ b/xorg-server/installer/vcxsrv.nsi
@@ -66,7 +66,7 @@ Section "VcXsrv (required)"
File "..\XErrorDB"
File "..\hw\xwin\xlaunch\obj\release\xlaunch.exe"
File "..\..\tools\plink\obj\release\plink.exe"
- File "..\..\mesalib\lib\opengl32.dll"
+ File "..\..\mesalib\windows\VC8\mesa\Release\opengl32.dll"
File "..\..\mesalib\windows\VC8\mesa\Release\swrast_dri.dll"
SetOutPath $INSTDIR\fonts
File /r "..\fonts\*.*"