Browse Source

Merge pull request #96 from aws-lumberyard-dev/iOSLibPngArmNeon

[iOS] Enable ARM neon optimizations for libpng to fix linker errors
amzn-sj 3 years ago
parent
commit
64031861fe
2 changed files with 5 additions and 3 deletions
  1. 3 1
      package-system/libpng/build_config.json
  2. 2 2
      package_build_list_host_darwin.json

+ 3 - 1
package-system/libpng/build_config.json

@@ -45,8 +45,10 @@
                     "-DPNG_SHARED=OFF",
                     "-DPNG_TESTS=OFF",
                     "-DPNG_DEBUG=OFF",
+                    "-DCMAKE_SYSTEM_PROCESSOR=arm",
+                    "-DPNG_ARM_NEON=on",
                     "-DCMAKE_SYSTEM_NAME=iOS",
-                    "-DCMAKE_OSX_DEPLOYMENT_TARGET=13.0",
+                    "-DCMAKE_OSX_DEPLOYMENT_TARGET=14.0",
                     "-DCMAKE_OSX_ARCHITECTURES=arm64"
                 ]
             }

+ 2 - 2
package_build_list_host_darwin.json

@@ -18,7 +18,7 @@
         "googletest-1.8.1-rev4-mac": "Scripts/extras/pull_and_build_from_git.py ../../package-system/googletest --platform-name Mac --package-root ../../package-system --clean",
         "ISPCTexComp-36b80aa-rev1-mac": "package-system/ISPCTexComp/build_package_image.py",
         "libpng-1.6.37-rev1-mac": "Scripts/extras/pull_and_build_from_git.py ../../package-system/libpng --platform-name Mac --package-root ../../package-system --clean",
-        "libpng-1.6.37-rev1-ios": "Scripts/extras/pull_and_build_from_git.py ../../package-system/libpng --platform-name iOS --package-root ../../package-system --clean",
+        "libpng-1.6.37-rev2-ios": "Scripts/extras/pull_and_build_from_git.py ../../package-system/libpng --platform-name iOS --package-root ../../package-system --clean",
         "libsamplerate-0.2.1-rev2-mac": "Scripts/extras/pull_and_build_from_git.py ../../package-system/libsamplerate --platform-name Mac --package-root ../../package-system --clean",
         "libsamplerate-0.2.1-rev2-ios": "Scripts/extras/pull_and_build_from_git.py ../../package-system/libsamplerate --platform-name iOS --package-root ../../package-system --clean",
         "OpenMesh-8.1-rev3-mac": "Scripts/extras/pull_and_build_from_git.py ../../package-system/OpenMesh --platform-name Mac --package-root ../../package-system --clean",
@@ -66,7 +66,7 @@
         "googletest-1.8.1-rev4-mac": "package-system/googletest-mac",
         "ISPCTexComp-36b80aa-rev1-mac": "package-system/ISPCTexComp-mac",
         "libpng-1.6.37-rev1-mac": "package-system/libpng-mac",
-        "libpng-1.6.37-rev1-ios": "package-system/libpng-ios",
+        "libpng-1.6.37-rev2-ios": "package-system/libpng-ios",
         "libsamplerate-0.2.1-rev2-mac": "package-system/libsamplerate-mac",
         "libsamplerate-0.2.1-rev2-ios": "package-system/libsamplerate-ios",
         "OpenMesh-8.1-rev3-mac": "package-system/OpenMesh-mac",