diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5642fe1..183fa17 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -160,11 +160,11 @@ jobs: FBX_FOLDER=$(echo "${{ github.workspace }}/FBXSDK" | sed 's|\\|/|g') echo "FBX_FOLDER=$FBX_FOLDER" >> $GITHUB_ENV if [ "${{ runner.os }}" == "Windows" ]; then - echo "FBX_OUTFILE=$FBX_FOLDER/fbx202037_fbxsdk_vs2022_win.exe" >> $GITHUB_ENV + echo "FBX_OUTFILE=$FBX_FOLDER/fbx202039_fbxsdk_vs2022_win.exe" >> $GITHUB_ENV elif [ "${{ runner.os }}" == "macOS" ]; then - echo "FBX_OUTFILE=$FBX_FOLDER/fbx202037_fbxsdk_clang_mac.pkg" >> $GITHUB_ENV + echo "FBX_OUTFILE=$FBX_FOLDER/fbx202039_fbxsdk_clang_mac.pkg" >> $GITHUB_ENV else - echo "FBX_OUTFILE=$FBX_FOLDER/fbx202037_fbxsdk_gcc_linux" >> $GITHUB_ENV + echo "FBX_OUTFILE=$FBX_FOLDER/fbx202039_fbxsdk_gcc_linux" >> $GITHUB_ENV fi - name: Install FBX SDK Windows @@ -182,18 +182,18 @@ jobs: run: | mkdir -p ${{ env.FBX_FOLDER }} if [ "${{ runner.os }}" == "macOS" ]; then - FBX_INSTALL_DIR="/Applications/Autodesk/FBXSDK/2020.3.7" + FBX_INSTALL_DIR="/Applications/Autodesk/FBXSDK/2020.3.9" tar -xzf ${{ env.FBX_OUTFILE }}.tgz -C ${{ env.FBX_FOLDER }} FBX_OUTFILE_CORRECTED=$(echo "${{ env.FBX_OUTFILE }}" | sed 's/_mac.pkg/_macos.pkg/') sudo installer -pkg $FBX_OUTFILE_CORRECTED -target / -verboseR sudo mv "/Applications/Autodesk/FBX SDK/" "/Applications/Autodesk/FBXSDK" - sudo sed -i '.bak' 's/mLefttChild/mLeftChild/g' "/Applications/Autodesk/FBXSDK/2020.3.7/include/fbxsdk/core/base/fbxredblacktree.h" + sudo sed -i '.bak' 's/mLefttChild/mLeftChild/g' "/Applications/Autodesk/FBXSDK/2020.3.9/include/fbxsdk/core/base/fbxredblacktree.h" else # Linux FBX_INSTALL_DIR=${{ github.workspace }}/FBX_SDK_INSTALL chmod +r ${{ env.FBX_OUTFILE }}.tar.gz tar -xzf ${{ env.FBX_OUTFILE }}.tar.gz -C ${{ env.FBX_FOLDER }} mkdir -p ${{ github.workspace }}/FBX_SDK_INSTALL - yes yes | ${{ env.FBX_FOLDER }}/fbx202037_fbxsdk_linux $FBX_INSTALL_DIR + yes yes | ${{ env.FBX_FOLDER }}/fbx202039_fbxsdk_linux $FBX_INSTALL_DIR fi echo "FBX_INSTALL_DIR=$FBX_INSTALL_DIR" >> $GITHUB_ENV diff --git a/.github/workflows/fbx-sdk.yml b/.github/workflows/fbx-sdk.yml index ac5524c..8bdf870 100644 --- a/.github/workflows/fbx-sdk.yml +++ b/.github/workflows/fbx-sdk.yml @@ -15,24 +15,24 @@ jobs: - name: Download SDKs run: | - curl -L -o fbx202037_fbxsdk_vs2022_win.exe -A "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/58.0.3029.110 Safari/537.36" "https://damassets.autodesk.net/content/dam/autodesk/www/files/fbx202037_fbxsdk_vs2022_win.exe" - curl -L -o fbx202037_fbxsdk_clang_mac.pkg.tgz -A "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/58.0.3029.110 Safari/537.36" "https://damassets.autodesk.net/content/dam/autodesk/www/files/fbx202037_fbxsdk_clang_mac.pkg.tgz" - curl -L -o fbx202037_fbxsdk_gcc_linux.tar.gz -A "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/58.0.3029.110 Safari/537.36" "https://damassets.autodesk.net/content/dam/autodesk/www/files/fbx202037_fbxsdk_gcc_linux.tar.gz" + curl -L -o fbx202039_fbxsdk_vs2022_win.exe -A "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/58.0.3029.110 Safari/537.36" "https://damassets.autodesk.net/content/dam/autodesk/www/files/fbx202039_fbxsdk_vs2022_win.exe" + curl -L -o fbx202039_fbxsdk_clang_mac.pkg.tgz -A "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/58.0.3029.110 Safari/537.36" "https://damassets.autodesk.net/content/dam/autodesk/www/files/fbx202039_fbxsdk_clang_mac.pkg.tgz" + curl -L -o fbx202039_fbxsdk_gcc_linux.tar.gz -A "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/58.0.3029.110 Safari/537.36" "https://damassets.autodesk.net/content/dam/autodesk/www/files/fbx202039_fbxsdk_gcc_linux.tar.gz" - name: Upload SDK for Windows uses: actions/upload-artifact@v6 with: name: Windows-FBX-SDK - path: fbx202037_fbxsdk_vs2022_win.exe + path: fbx202039_fbxsdk_vs2022_win.exe - name: Upload SDK for macOS uses: actions/upload-artifact@v6 with: name: macOS-FBX-SDK - path: fbx202037_fbxsdk_clang_mac.pkg.tgz + path: fbx202039_fbxsdk_clang_mac.pkg.tgz - name: Upload SDK for Linux uses: actions/upload-artifact@v6 with: name: Linux-FBX-SDK - path: fbx202037_fbxsdk_gcc_linux.tar.gz + path: fbx202039_fbxsdk_gcc_linux.tar.gz diff --git a/README.md b/README.md index 3f1eb39..ff78305 100644 --- a/README.md +++ b/README.md @@ -41,7 +41,7 @@ The following dependencies are needed: | [Pixar USD](https://github.com/PixarAnimationStudios/USD) | 23.08-25.11 | all | no | | [GTest](https://github.com/google/googletest.git) | 1.11.0 | all tests | yes | | [Eigen](https://gitlab.com/libeigen/eigen) | 3.4.0 | usdply, usdspz | no | -| [FBX SDK](https://aps.autodesk.com/developer/overview/fbx-sdk) | 2020.3.7 | usdfbx | no | +| [FBX SDK](https://aps.autodesk.com/developer/overview/fbx-sdk) | 2020.3.9 | usdfbx | no | | [LibXml2](https://gitlab.gnome.org/GNOME/libxml2) | 2.10.0 | usdfbx | no | | [Zlib](https://github.com/madler/zlib.git) | 1.2.11 | usdfbx, usdgltf | no | | [TinyGltf](https://github.com/syoyo/tinygltf) | 2.8.21 | usdgltf | no |