Merge branch 'master' of https://github.com/FirestormViewer/phoenix-f…

…irestorm
AiraYumi · Mar 30, 2024 · e1eeaa6 · e1eeaa6
2 parents 8c7623c + 60c6edd
commit e1eeaa6
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/doc/building_linux.md b/doc/building_linux.md
@@ -46,14 +46,12 @@ sudo apt install libgl1-mesa-dev libglu1-mesa-dev libpulse-dev build-essential p
 ### Install Autobuild
 
 Autobuild is a Linden Lab resource that does all the hard work.
-
+You can install it using the same versions as our automated builds as follows:
 ```
 sudo pip3 install --upgrade pip
-sudo pip3 install git+https://github.com/secondlife/autobuild.git#egg=autobuild
+pip install -r requirements.txt
 ```
-
-Check Autobuild version to be "autobuild 4" or higher: `autobuild --version`
-
+Check Autobuild version to be "autobuild 3.9.3" or higher: `autobuild --version`
 ## Download the source code
 
 There are two required repositories, the viewer itself and the build variables. An optional third repository is used to configure and package FMOD Studio.

diff --git a/doc/building_macos.md b/doc/building_macos.md
@@ -40,7 +40,7 @@ sudo python3 get-pip.py
 The Linden Lab [Autobuild](https://github.com/secondlife/autobuild) tool.
 - Use the following command to install it on your machine:
 ```
-pip3 install --user git+https://bitbucket.org/lindenlab/autobuild.git#egg=autobuild
+pip3 install --user -r requirements.txt
 ```
 
 - Add it to your PATH environment variable so it can be found by the shell. The macOS-approved way to do this is to issue the following command (This change will not take effect until the next time you open a Terminal window.):
@@ -53,7 +53,7 @@ echo '~/Library/Python/3.7/bin/' | sudo tee /etc/paths.d/99-autobuild
 export PATH=$PATH:~/Library/Python/3.7/bin/
 ```
 
-- Check Autobuild version to be "autobuild 3.8" or higher: `autobuild --version`
+- Check Autobuild version to be "autobuild 3.9.3" or higher: `autobuild --version`
 
 ### Additional third party libraries 
 If you want to use licensed FMOD Studio API or KDU build libraries (they are optional) you have to provide these yourself. If you're building Firestorm as part of the project team, ask for the libraries for fmodstudio and kdu. Put them into `/opt/firestorm`.

diff --git a/doc/building_windows.md b/doc/building_windows.md
@@ -93,9 +93,11 @@ If they all report sensible values and not "Command not found" errors, then you
 ### Set up Autobuild
 
 - Install Autobuild
+   You can install autobuild and its dependencies using the `requirements.txt` file that is part of the repo, this will build using the same versions that our official builds use.
+  - Open Windows Command Prompt and enter: <code>pip install -r requirements.txt</code>
+  - Autobuild will be installed. **Earlier versions of Autobuild could be made to work by just putting the source files into your path correctly; this is no longer true - Autobuild _must_ be installed as described here.**
   - Open Windows Command Prompt and enter:
     `pip install git+https://github.com/secondlife/autobuild.git#egg=autobuild`
-  - Autobuild will be installed. **Earlier versions of Autobuild could be made to work by just putting the source files into your path correctly; this is no longer true - Autobuild _must_ be installed as described here.**
 - Set environment variable AUTOBUILD_VSVER to 170 (170 = Visual Studio 2022).
 - Check Autobuild version to be "autobuild 3.8" or higher:
   `autobuild --version`