diff options
| author | Jan-Marek Glogowski <glogow@fbihome.de> | 2021-03-22 22:13:39 +0100 |
|---|---|---|
| committer | Jan-Marek Glogowski <glogow@fbihome.de> | 2021-03-23 23:46:12 +0100 |
| commit | 5e1b3e924ab3d8da3718c2a3bbd0ef812595684a (patch) | |
| tree | 1af73a649f62f6db48b546958979840b24e13b19 /external/libpng/StaticLibrary_libpng.mk | |
| parent | WIN always check jdk_home path and content (diff) | |
| download | core-5e1b3e924ab3d8da3718c2a3bbd0ef812595684a.tar.gz core-5e1b3e924ab3d8da3718c2a3bbd0ef812595684a.zip | |
Rename LO Windows arm64 ID to aarch64
The Windows platform is called Arm64. But now that the ID for Mac
is also going to be renamed from arm64 to aarch64, this get's rid
of the arm64 as the UNO identifier and user in gbuild, just like
on all other Arm64 platforms.
Change-Id: I60a7eafd04b426f17b6e41ad9a09e6405c0d4173
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112973
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
Diffstat (limited to 'external/libpng/StaticLibrary_libpng.mk')
| -rw-r--r-- | external/libpng/StaticLibrary_libpng.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/external/libpng/StaticLibrary_libpng.mk b/external/libpng/StaticLibrary_libpng.mk index bc23354fa113..6f07750c55eb 100644 --- a/external/libpng/StaticLibrary_libpng.mk +++ b/external/libpng/StaticLibrary_libpng.mk @@ -33,7 +33,7 @@ $(eval $(call gb_StaticLibrary_add_generated_cobjects,libpng,\ UnpackedTarball/libpng/pngwrite \ UnpackedTarball/libpng/pngwtran \ UnpackedTarball/libpng/pngwutil \ - $(if $(filter ARM AARCH64 ARM64,$(CPUNAME)),\ + $(if $(filter ARM AARCH64,$(CPUNAME)),\ UnpackedTarball/libpng/arm/arm_init \ UnpackedTarball/libpng/arm/filter_neon_intrinsics \ UnpackedTarball/libpng/arm/palette_neon_intrinsics \ @@ -49,7 +49,7 @@ $(eval $(call gb_StaticLibrary_add_generated_cobjects,libpng,\ )) $(eval $(call gb_StaticLibrary_add_defs,libpng,\ - $(if $(filter ARM AARCH64 ARM64,$(CPUNAME)), -DPNG_ARM_NEON) \ + $(if $(filter ARM AARCH64,$(CPUNAME)), -DPNG_ARM_NEON) \ $(if $(filter POWERPC POWERPC64,$(CPUNAME)), -DPNG_POWERPC_VSX ) \ $(if $(filter INTEL X86_64,$(CPUNAME)), -DPNG_INTEL_SSE_OPT) \ )) |