From b2aa5beb96c266533fb6b93fc45babc74ea31cb5 Mon Sep 17 00:00:00 2001 From: rdb Date: Tue, 4 Jan 2022 15:33:31 +0100 Subject: [PATCH] Use 1.10.11 thirdparty tools --- .github/workflows/ci.yml | 12 ++++++------ README.md | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 104acdde0c..bdc640961a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -20,16 +20,16 @@ jobs: shell: powershell run: | $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 - 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) if: runner.os == 'macOS' run: | - curl -O https://www.panda3d.org/download/panda3d-1.10.10/panda3d-1.10.10-tools-mac.tar.gz - tar -xf panda3d-1.10.10-tools-mac.tar.gz - mv panda3d-1.10.10/thirdparty thirdparty - rmdir panda3d-1.10.10 + curl -O https://www.panda3d.org/download/panda3d-1.10.11/panda3d-1.10.11-tools-mac.tar.gz + tar -xf panda3d-1.10.11-tools-mac.tar.gz + mv panda3d-1.10.11/thirdparty thirdparty + rmdir panda3d-1.10.11 (cd thirdparty/darwin-libs-a && rm -rf rocket) - name: Set up Python 3.9 uses: actions/setup-python@v2 diff --git a/README.md b/README.md index 1b3cd3d1bf..1fb6d99fb3 100644 --- a/README.md +++ b/README.md @@ -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 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.10/panda3d-1.10.10-tools-win32.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.11/panda3d-1.10.11-tools-win32.zip After acquiring these dependencies, you can build Panda3D from the command 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 -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, you may build Panda3D using a command like the following: