diff options
| author | marha <marha@users.sourceforge.net> | 2009-10-11 13:58:34 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2009-10-11 13:58:34 +0000 |
| commit | 5d30999c0fed9919ec9c55d87d84665f79d51ca2 (patch) | |
| tree | 7347490381f22a1f012c0fae0fe6d116ca0b5871 | |
| parent | 6465e1afb26d7f01a0d4d9e735ddc955dfc6d4a8 (diff) | |
| download | vcxsrv-5d30999c0fed9919ec9c55d87d84665f79d51ca2.tar.gz vcxsrv-5d30999c0fed9919ec9c55d87d84665f79d51ca2.tar.bz2 vcxsrv-5d30999c0fed9919ec9c55d87d84665f79d51ca2.zip | |
Use opengl32.dll from Release directory instead of lib in installer.
Added mesa building instructions to building.txt
| -rw-r--r-- | building.txt | 5 | ||||
| -rw-r--r-- | xorg-server/installer/vcxsrv.nsi | 2 |
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\*.*"
|