Переглянути джерело

Disabling std filesystem in OpenXR linux due to linking problems with O3DE. (#114)

Signed-off-by: moraaar <[email protected]>
moraaar 3 роки тому
батько
коміт
d54c461935

+ 3 - 2
package-system/OpenXR/build_config.json

@@ -2,7 +2,7 @@
    "git_url":"https://github.com/KhronosGroup/OpenXR-SDK.git",
    "git_tag":"release-1.0.22",
    "package_name":"OpenXR",
-   "package_version":"1.0.22-rev1",
+   "package_version":"1.0.22-rev2",
    "package_url":"https://www.khronos.org/openxr/",
    "package_license":"Apache-2.0",
    "package_license_file":"LICENSE",
@@ -55,7 +55,8 @@
             ],
             "cmake_generate_args": [
                "-G",
-               "\"Ninja Multi-Config\""
+               "\"Ninja Multi-Config\"",
+               "-DBUILD_WITH_STD_FILESYSTEM=OFF"
             ],
             "custom_test_cmd" : [
            ]

+ 2 - 2
package_build_list_host_linux.json

@@ -19,7 +19,7 @@
         "OpenMesh-8.1-rev3-linux": "Scripts/extras/pull_and_build_from_git.py ../../package-system/OpenMesh --platform-name Linux --package-root ../../package-system --clean",
         "pyside2-5.15.2-rev2-linux": "Scripts/extras/pull_and_build_from_git.py ../../package-system/pyside2-qt --platform-name Linux --package-root ../../package-system --clean",
         "OpenEXR-3.1.3-rev4-linux": "Scripts/extras/pull_and_build_from_git.py ../../package-system/OpenEXR --platform-name Linux --package-root ../../package-system/OpenEXR/temp --clean",
-        "OpenXR-1.0.22-rev1-linux": "Scripts/extras/pull_and_build_from_git.py ../../package-system/OpenXR --platform-name Linux --package-root ../../package-system --clean",
+        "OpenXR-1.0.22-rev2-linux": "Scripts/extras/pull_and_build_from_git.py ../../package-system/OpenXR --platform-name Linux --package-root ../../package-system --clean",
         "PhysX-4.1.2.29882248-rev5-linux": "package-system/PhysX/build_package_image.py --platform-name linux",
         "NvCloth-v1.1.6-4-gd243404-pr58-rev1-linux": "package-system/NvCloth/build_package_image.py --platform-name linux",
         "poly2tri-7f0487a-rev1-linux": "package-system/poly2tri/build_package_image.py --platform-name linux",
@@ -54,7 +54,7 @@
         "OpenMesh-8.1-rev3-linux": "package-system/OpenMesh-linux",
         "pyside2-5.15.2-rev2-linux": "package-system/pyside2-linux",
         "OpenEXR-3.1.3-rev4-linux": "package-system/OpenEXR/temp/OpenEXR-linux",
-        "OpenXR-1.0.22-rev1-linux": "package-system/OpenXR-linux",
+        "OpenXR-1.0.22-rev2-linux": "package-system/OpenXR-linux",
         "SPIRVCross-2021.04.29-rev1-linux": "package-system/SPIRVCross-linux",
         "squish-ccr-deb557d-rev1-linux": "package-system/squish-ccr-linux",
         "astc-encoder-3.2-rev2-linux": "package-system/astc-encoder-linux",