Skip to content

Commit 4b4d807

Browse files
authored
Merge pull request #9390 from akien-mga/compiling-scons-3.1.2-gcc-9
Compiling: Min versions are now SCons 3.1.2 and GCC 9
2 parents 881b736 + 55f6c52 commit 4b4d807

File tree

6 files changed

+7
-17
lines changed

6 files changed

+7
-17
lines changed

contributing/development/compiling/compiling_for_android.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ Requirements
2727
For compiling under Windows, Linux or macOS, the following is required:
2828

2929
- `Python 3.6+ <https://www.python.org/downloads/>`_.
30-
- `SCons 3.0+ <https://scons.org/pages/download.html>`_ build system.
30+
- `SCons 3.1.2+ <https://scons.org/pages/download.html>`_ build system.
3131
- `Android SDK <https://developer.android.com/studio/#command-tools>`_
3232
(command-line tools are sufficient).
3333

contributing/development/compiling/compiling_for_ios.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ Requirements
1414
------------
1515

1616
- `Python 3.6+ <https://www.python.org/downloads/macos/>`_.
17-
- `SCons 3.0+ <https://scons.org/pages/download.html>`_ build system.
17+
- `SCons 3.1.2+ <https://scons.org/pages/download.html>`_ build system.
1818
- `Xcode <https://apps.apple.com/us/app/xcode/id497799835>`_.
1919

2020
If you are building the ``master`` branch:

contributing/development/compiling/compiling_for_linuxbsd.rst

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -16,19 +16,9 @@ Requirements
1616
For compiling under Linux or other Unix variants, the following is
1717
required:
1818

19-
- GCC 7+ or Clang 6+.
20-
19+
- GCC 9+ or Clang 6+.
2120
- `Python 3.6+ <https://www.python.org/downloads/>`_.
22-
23-
- `SCons 3.0+ <https://scons.org/pages/download.html>`_ build system.
24-
25-
.. note::
26-
27-
If your distribution uses Python 2 by default, or you are using a version of SCons prior to 3.1.2,
28-
you will need to change the version of Python that SCons uses by changing the shebang
29-
(the first line) of the SCons script file to ``#! /usr/bin/python3``.
30-
Use the command ``which scons`` to find the location of the SCons script file.
31-
21+
- `SCons 3.1.2+ <https://scons.org/pages/download.html>`_ build system.
3222
- pkg-config (used to detect the development libraries listed below).
3323
- Development libraries:
3424

contributing/development/compiling/compiling_for_macos.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ Requirements
1616
For compiling under macOS, the following is required:
1717

1818
- `Python 3.6+ <https://www.python.org/downloads/macos/>`_.
19-
- `SCons 3.0+ <https://scons.org/pages/download.html>`_ build system.
19+
- `SCons 3.1.2+ <https://scons.org/pages/download.html>`_ build system.
2020
- `Xcode <https://apps.apple.com/us/app/xcode/id497799835>`_
2121
(or the more lightweight Command Line Tools for Xcode).
2222
- `Vulkan SDK <https://sdk.lunarg.com/sdk/download/latest/mac/vulkan-sdk.dmg>`_

contributing/development/compiling/compiling_for_web.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ To compile export templates for the Web, the following is required:
1717

1818
- `Emscripten 3.1.39+ <https://emscripten.org>`__.
1919
- `Python 3.6+ <https://www.python.org/>`__.
20-
- `SCons 3.0+ <https://scons.org/pages/download.html>`__ build system.
20+
- `SCons 3.1.2+ <https://scons.org/pages/download.html>`__ build system.
2121

2222
.. seealso:: To get the Godot source code for compiling, see
2323
:ref:`doc_getting_source`.

contributing/development/compiling/compiling_for_windows.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ For compiling under Windows, the following is required:
2525
**Important:** When using MinGW to compile the ``master`` branch, you need GCC 9 or later.
2626
- `Python 3.6+ <https://www.python.org/downloads/windows/>`_.
2727
**Make sure to enable the option to add Python to the ``PATH`` in the installer.**
28-
- `SCons 3.0+ <https://scons.org/pages/download.html>`_ build system. Using the
28+
- `SCons 3.1.2+ <https://scons.org/pages/download.html>`_ build system. Using the
2929
latest release is recommended, especially for proper support of recent Visual
3030
Studio releases.
3131

0 commit comments

Comments
 (0)