diff options
| author | meme <meme@users.noreply.github.com> | 2020-12-28 22:38:52 -0500 |
|---|---|---|
| committer | Andreas Kling <kling@serenityos.org> | 2020-12-29 17:42:04 +0100 |
| commit | 23b23cee5a8e7b0666de3d5a0991bc1b3bb8d244 (patch) | |
| tree | b91e24f2839c2ff8b27545c11e084a4cb19e886c /Documentation | |
| parent | 8ca0e8325a5e2cc94b0a54d3ea9995fe33b75cde (diff) | |
| download | serenity-23b23cee5a8e7b0666de3d5a0991bc1b3bb8d244.zip | |
Build: Support non-i686 toolchains
* Add SERENITY_ARCH option to CMake for selecting the target toolchain
* Port all build scripts but continue to use i686
* Update GitHub Actions cache to include BuildIt.sh
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/UsingQtCreator.md | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/UsingQtCreator.md b/Documentation/UsingQtCreator.md index c2d7e662c6..3535170fd2 100644 --- a/Documentation/UsingQtCreator.md +++ b/Documentation/UsingQtCreator.md @@ -15,7 +15,7 @@ First, make sure you have a working toolchain and can build and run SerenityOS. * Edit the `serenity.config` file (In Qt Creator, hit ^K or CMD+K on a Mac to open the search dialog, type the name of the file and hit return to open it) * Add the following `#define`s to the file: `DEBUG`, `SANITIZE_PTRS`, and `KERNEL`. Depending on what you are working on, you need to have that last define commented out. If you're planning on working in the userland, comment out `#define KERNEL`. If you're working on the Kernel, then uncomment `#define KERNEL`. * Edit the `serenity.cxxflags` file to say `-std=c++2a -m32` -* Edit the `serenity.includes` file, add the following lines: `.`, `..`, `../..`, `Services/`, `Libraries/`, `Libraries/LibC/`, `Libraries/LibPthread/`, `Libraries/LibM/`, `Toolchain/Local/i686-pc-serenity/include/c++/10.2.0`, `Build/Services/`, `Build/Libraries/`, `AK/` +* Edit the `serenity.includes` file, add the following lines: `.`, `..`, `../..`, `Services/`, `Libraries/`, `Libraries/LibC/`, `Libraries/LibPthread/`, `Libraries/LibM/`, `Toolchain/Local/i686/i686-pc-serenity/include/c++/10.2.0`, `Build/Services/`, `Build/Libraries/`, `AK/` Qt Creator should be set up correctly now, go ahead and explore the project and try making changes. Have fun! :^) @@ -42,4 +42,4 @@ You may want to read up what `git add -p` does (or `git checkout -p`, to undo). ## Compiler Kits You can slightly improve how well Qt interprets the code by adding and setting up an appropriate "compiler kit". -For that you will need to reference the compilers at `Toolchain/Local/bin/i686-pc-serenity-gcc` and `Toolchain/Local/bin/i686-pc-serenity-g++`. +For that you will need to reference the compilers at `Toolchain/Local/i686/bin/i686-pc-serenity-gcc` and `Toolchain/Local/i686/bin/i686-pc-serenity-g++`. |