diff options
author | Matt Turner <mattst88@gmail.com> | 2021-03-21 13:27:57 -0400 |
---|---|---|
committer | Marge Bot <eric+marge@anholt.net> | 2021-03-30 20:17:19 +0000 |
commit | b58fbfa828254f893a6862ce3705f35fe3235874 (patch) | |
tree | c873391d42d7a87cf9b441fa78c8fb434aa9cb1f /docs | |
parent | 40647fcc3dbe582e91913271cebd6b2b7c5f8584 (diff) | |
download | mesa-b58fbfa828254f893a6862ce3705f35fe3235874.tar.gz mesa-b58fbfa828254f893a6862ce3705f35fe3235874.tar.bz2 mesa-b58fbfa828254f893a6862ce3705f35fe3235874.zip |
Remove Scons leftovers
Fixes: 6e6cd7d93cc54fc8c279 ("scons: Remove.")
Reviewed-by: Eric Engestrom <eric@engestrom.ch>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9738>
Diffstat (limited to 'docs')
-rw-r--r-- | docs/drivers/openswr/usage.rst | 6 | ||||
-rw-r--r-- | docs/install.rst | 44 | ||||
-rw-r--r-- | docs/shading.rst | 3 | ||||
-rw-r--r-- | docs/systems.rst | 1 |
4 files changed, 6 insertions, 48 deletions
diff --git a/docs/drivers/openswr/usage.rst b/docs/drivers/openswr/usage.rst index 61c30c27c4f..1fb5e04a13b 100644 --- a/docs/drivers/openswr/usage.rst +++ b/docs/drivers/openswr/usage.rst @@ -26,12 +26,6 @@ for libGL.so into:: lib/gallium/libswrAVX.so lib/gallium/libswrAVX2.so -Alternatively, building with SCons will produce:: - - build/linux-x86_64/gallium/targets/libgl-xlib/libGL.so - build/linux-x86_64/gallium/drivers/swr/libswrAVX.so - build/linux-x86_64/gallium/drivers/swr/libswrAVX2.so - To use it set the LD_LIBRARY_PATH environment variable accordingly. **IMPORTANT:** Mesa will default to using llvmpipe or softpipe as the default software renderer. To select the OpenSWR driver, set the GALLIUM_DRIVER environment variable appropriately: :: diff --git a/docs/install.rst b/docs/install.rst index c02bc8df7b2..d4518f90f20 100644 --- a/docs/install.rst +++ b/docs/install.rst @@ -17,9 +17,7 @@ Build system ^^^^^^^^^^^^ - `Meson <https://mesonbuild.com>`__ is required when building on \*nix - platforms and is supported on Windows. -- `SCons <http://www.scons.org/>`__ is an alternative for building on - Windows and Linux. + platforms and on Windows. - Android Build system when building as native Android component. Meson is used when when building ARC. @@ -37,9 +35,7 @@ you're willing to maintain support for other compiler get in touch. Third party/extra tools. ^^^^^^^^^^^^^^^^^^^^^^^^ -- `Python <https://www.python.org/>`__ - Python is required. When - building with SCons 2.7 is required. When building with meson 3.5 or - newer is required. +- `Python <https://www.python.org/>`__ - Python 3.5 or newer is required. - `Python Mako module <http://www.makotemplates.org/>`__ - Python Mako module is required. Version 0.8.0 or later should work. - lex / yacc - for building the Mesa IR and GLSL compiler. @@ -105,37 +101,7 @@ On Windows you can also use the Visual Studio backend Please read the :doc:`detailed meson instructions <meson>` for more information -3. Building with SCons (Windows/Linux) --------------------------------------- - -To build Mesa with SCons on Linux or Windows do - -:: - - scons - -The build output will be placed in -build/\ *platform*-*machine*-*debug*/..., where *platform* is for -example Linux or Windows, *machine* is x86 or x86_64, optionally -followed by -debug for debug builds. - -To build Mesa with SCons for Windows on Linux using the MinGW -crosscompiler toolchain do - -:: - - scons platform=windows toolchain=crossmingw machine=x86 libgl-gdi - -This will create: - -- build/windows-x86-debug/gallium/targets/libgl-gdi/opengl32.dll — Mesa - + Gallium + softpipe (or llvmpipe), binary compatible with Windows's - opengl32.dll - -Put them all in the same directory to test them. Additional information -is available in `README.WIN32 <README.WIN32>`__. - -4. Building with AOSP (Android) +3. Building with AOSP (Android) ------------------------------- Currently one can build Mesa for Android as part of the AOSP project, @@ -148,7 +114,7 @@ the libGLES_mesa library. FINISHME: Improve on the instructions add references to Rob H repos/Jenkins, Android-x86 and/or other resources. -5. Library Information +4. Library Information ---------------------- When compilation has finished, look in the top-level ``lib/`` (or @@ -179,7 +145,7 @@ If you built the DRI hardware drivers, you'll also see the DRI drivers: If you built with Gallium support, look in lib/gallium/ for Gallium-based versions of libGL and device drivers. -6. Building OpenGL programs with pkg-config +5. Building OpenGL programs with pkg-config ------------------------------------------- Running ``ninja install`` will install package configuration files for diff --git a/docs/shading.rst b/docs/shading.rst index d41a4902609..2e46727c71b 100644 --- a/docs/shading.rst +++ b/docs/shading.rst @@ -37,8 +37,7 @@ Experimenting with Shader Replacements ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Shaders can be dumped and replaced on runtime for debugging purposes. -This feature is not currently supported by SCons build. This is -controlled via following environment variables: +This is controlled via following environment variables: - **MESA_SHADER_DUMP_PATH** - path where shader sources are dumped - **MESA_SHADER_READ_PATH** - path where replacement shaders are read diff --git a/docs/systems.rst b/docs/systems.rst index a24a0cf01e3..9e95dfd6a88 100644 --- a/docs/systems.rst +++ b/docs/systems.rst @@ -46,7 +46,6 @@ Additional driver information: Window System - :doc:`Xlib / swrast driver <xlibdriver>` for the X Window System and Unix-like operating systems -- `Microsoft Windows <README.WIN32>`__ Deprecated Systems and Drivers ------------------------------ |