Use 1.10.11 thirdparty tools

This commit is contained in:
rdb 2022-01-04 15:33:31 +01:00
parent 4ce5efb044
commit b2aa5beb96
2 changed files with 9 additions and 9 deletions

View File

@ -20,16 +20,16 @@ jobs:
shell: powershell shell: powershell
run: | run: |
$wc = New-Object System.Net.WebClient $wc = New-Object System.Net.WebClient
$wc.DownloadFile("https://www.panda3d.org/download/panda3d-1.10.10/panda3d-1.10.10-tools-win64.zip", "thirdparty-tools.zip") $wc.DownloadFile("https://www.panda3d.org/download/panda3d-1.10.11/panda3d-1.10.11-tools-win64.zip", "thirdparty-tools.zip")
Expand-Archive -Path thirdparty-tools.zip Expand-Archive -Path thirdparty-tools.zip
Move-Item -Path thirdparty-tools/panda3d-1.10.10/thirdparty -Destination . Move-Item -Path thirdparty-tools/panda3d-1.10.11/thirdparty -Destination .
- name: Get thirdparty packages (macOS) - name: Get thirdparty packages (macOS)
if: runner.os == 'macOS' if: runner.os == 'macOS'
run: | run: |
curl -O https://www.panda3d.org/download/panda3d-1.10.10/panda3d-1.10.10-tools-mac.tar.gz curl -O https://www.panda3d.org/download/panda3d-1.10.11/panda3d-1.10.11-tools-mac.tar.gz
tar -xf panda3d-1.10.10-tools-mac.tar.gz tar -xf panda3d-1.10.11-tools-mac.tar.gz
mv panda3d-1.10.10/thirdparty thirdparty mv panda3d-1.10.11/thirdparty thirdparty
rmdir panda3d-1.10.10 rmdir panda3d-1.10.11
(cd thirdparty/darwin-libs-a && rm -rf rocket) (cd thirdparty/darwin-libs-a && rm -rf rocket)
- name: Set up Python 3.9 - name: Set up Python 3.9
uses: actions/setup-python@v2 uses: actions/setup-python@v2

View File

@ -64,8 +64,8 @@ depending on whether you are on a 32-bit or 64-bit system, or you can
[click here](https://github.com/rdb/panda3d-thirdparty) for instructions on [click here](https://github.com/rdb/panda3d-thirdparty) for instructions on
building them from source. building them from source.
- https://www.panda3d.org/download/panda3d-1.10.10/panda3d-1.10.10-tools-win64.zip - https://www.panda3d.org/download/panda3d-1.10.11/panda3d-1.10.11-tools-win64.zip
- https://www.panda3d.org/download/panda3d-1.10.10/panda3d-1.10.10-tools-win32.zip - https://www.panda3d.org/download/panda3d-1.10.11/panda3d-1.10.11-tools-win32.zip
After acquiring these dependencies, you can build Panda3D from the command After acquiring these dependencies, you can build Panda3D from the command
prompt using the following command. Change the `--msvc-version` option based prompt using the following command. Change the `--msvc-version` option based
@ -136,7 +136,7 @@ macOS
----- -----
On macOS, you will need to download a set of precompiled thirdparty packages in order to On macOS, you will need to download a set of precompiled thirdparty packages in order to
compile Panda3D, which can be acquired from [here](https://www.panda3d.org/download/panda3d-1.10.10/panda3d-1.10.10-tools-mac.tar.gz). compile Panda3D, which can be acquired from [here](https://www.panda3d.org/download/panda3d-1.10.11/panda3d-1.10.11-tools-mac.tar.gz).
After placing the thirdparty directory inside the panda3d source directory, After placing the thirdparty directory inside the panda3d source directory,
you may build Panda3D using a command like the following: you may build Panda3D using a command like the following: