Skip to content

Commit 309c3c0

Browse files
authored
Merge pull request #10754 from van800/shakhov/macosx
Reflect the changes to Rider setup after the fix of the project generation logic to support any OS with and without MSVC toolchain
2 parents f66ca15 + 56e5456 commit 309c3c0

File tree

2 files changed

+39
-22
lines changed

2 files changed

+39
-22
lines changed

contributing/development/compiling/index.rst

+2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
:allow_comments: False
22

3+
.. _doc_compiling_index:
4+
35
Building from source
46
====================
57

contributing/development/configuring_an_ide/rider.rst

+37-22
Original file line numberDiff line numberDiff line change
@@ -4,51 +4,43 @@ JetBrains Rider
44
===============
55

66
`JetBrains Rider <https://www.jetbrains.com/rider/>`_ is a commercial
7-
`JetBrains <https://www.jetbrains.com/>`_ IDE for C# and C++ that uses the same solution system as Visual Studio.
7+
`JetBrains <https://www.jetbrains.com/>`_ IDE for C++, C# and GDScript that uses the same solution system as Visual Studio.
88

99
.. note::
1010

11-
This documentation is for contributions to the game engine, and not using
11+
This documentation is for contributing to the game engine, not for using
1212
JetBrains Rider as a C# or GDScript editor. To code C# or GDScript in an external editor, see
1313
:ref:`the C# guide to configure an external editor <doc_c_sharp_setup_external_editor>`.
1414

1515
Importing the project
1616
---------------------
1717

18-
You will need to install `Python <https://www.python.org/>`_ in your development environment
19-
along with `MinGW <https://www.mingw-w64.org/downloads/>`_. You will also need the Visual Studio C++ Build Tools, which
20-
you can install using the Visual Studio Installer. Ensure all dependencies are installed
21-
before you continue to the next steps.
22-
2318
.. tip:: If you already use Visual Studio as your main IDE, you can use the same solution file in Rider.
2419
Rider and Visual Studio use the same solution format, so you can switch between the two IDEs without rebuilding the solution file.
2520
Debug configurations need to be changed when going from one IDE to another.
2621

27-
Rider requires a solution file to work on a C++ project. While Godot does not come
28-
with a solution file, it can be generated using SCons.
22+
If you are starting from the scratch, please follow :ref:`instructions<doc_compiling_index>`, specifically:
2923

30-
- Navigate to the Godot root folder and open a Command Prompt or PowerShell window.
31-
- Copy, paste and run the next command to generate the solution.
24+
- Install all the dependencies.
25+
- Figure out the scons command for compiling to target a specific platform.
3226

33-
::
27+
Provide scons with additional arguments to request a solution file generation:
3428

35-
scons platform=windows vsproj=yes dev_build=yes
29+
- Add `vsproj=yes dev_build=yes` to the scons command
3630

3731
The ``vsproj`` parameter signals that you want Visual Studio solution generated.
38-
The ``dev_build`` parameter makes sure the debug symbols are included, allowing to e.g. step through code using breakpoints.
32+
The ``dev_build`` parameter ensures the debug symbols are included, allowing to e.g. step through code using breakpoints.
3933

40-
- If you have Rider setup as your main IDE for .sln, you can now open the project by double-clicking on the ``godot.sln`` in the project root
41-
or by using the **Open** option inside of Rider.
34+
- Open the generated ``godot.sln`` in Rider.
4235

43-
.. note:: Rider could fail to build the solution.
44-
If that is the case, try running `git clean -xdf` to remove all traces of the previous build artifacts
45-
and regenerate the build files using the `scons` command again. Restarting the terminal and your
46-
development environment may help.
36+
.. note:: Ensure that the appropriate Solution configuration is selected on the
37+
Rider toolbar. It affects resolve of the SDKs, code analysis, build, run,
38+
etc.
4739

4840
Compiling and debugging the project
4941
-----------------------------------
5042
Rider comes with a built-in debugger that can be used to debug the Godot project. You can launch the debugger
51-
by pressing the **Debug** icon at the top of the screen, this only works for the Project manager,
43+
by pressing the **Debug** icon at the top of the screen, this only works for the Project Manager,
5244
if you want to debug the editor, you need to configure the debugger first.
5345

5446
.. figure:: img/rider_run_debug.webp
@@ -66,7 +58,7 @@ if you want to debug the editor, you need to configure the debugger first.
6658
- Working Directory: ``$(LocalDebuggerWorkingDirectory)``
6759
- Before Launch has a value of "Build Project"
6860

69-
This will tell the executable to debug the specified project without using the project manager.
61+
This will tell the executable to debug the specified project without opening the Project Manager.
7062
Use the root path to the project folder, not ``project.godot`` file path.
7163

7264
.. figure:: img/rider_configurations_changed.webp
@@ -86,4 +78,27 @@ Alternatively you can use **Run > Attach to Process** to attach the debugger to
8678
.. figure:: img/rider_attach_to_process_dialog.webp
8779
:align: center
8880

81+
|
82+
83+
Debug visualizers
84+
-----------------
85+
Debug visualizers customize how complex data structures are displayed during debugging.
86+
For Windows "natvis" (short for "Native Visualization") built-in with Godot are automatically used.
87+
For other operating systems, similar functionality can be setup manually.
88+
89+
Please follow `RIDER-123535 <https://youtrack.jetbrains.com/issue/RIDER-123535/nix-Debug-Godot-Cpp-from-Rider-pretty-printers-usability>`_.
90+
91+
Unit testing
92+
------------
93+
Leverage Rider :ref:`doctest<doc_unit_testing>` support.
94+
Please follow `RIDER-122019 <https://youtrack.jetbrains.com/issue/RIDER-122019/Godot-doctest-Unit-Tests-Stuck-in-pending>`_.
95+
96+
Profiling
97+
---------
98+
Please refer to `the profiling instructions <https://github.com/JetBrains/godot-support/wiki/Profiling-Godot-engine-(native-code)-with-dotTrace-or-JetBrains-Rider>`_.
99+
89100
Please consult the `JetBrains Rider documentation <https://www.jetbrains.com/rider/documentation/>`_ for any specific information about the JetBrains IDE.
101+
102+
Known issues
103+
------------
104+
Debugging Windows MinGV build - symbols are not loaded. Reported `RIDER-106816 <https://youtrack.jetbrains.com/issue/RIDER-106816/Upgrade-LLDB-to-actual-version>`_.

0 commit comments

Comments
 (0)