diff options
Diffstat (limited to 'Build/source/libs/icu/icu-src/source/extra/uconv/makedata.mak')
-rw-r--r-- | Build/source/libs/icu/icu-src/source/extra/uconv/makedata.mak | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/Build/source/libs/icu/icu-src/source/extra/uconv/makedata.mak b/Build/source/libs/icu/icu-src/source/extra/uconv/makedata.mak index b30f59728b5..81fcc908ee6 100644 --- a/Build/source/libs/icu/icu-src/source/extra/uconv/makedata.mak +++ b/Build/source/libs/icu/icu-src/source/extra/uconv/makedata.mak @@ -51,8 +51,16 @@ PKGMODE=static ICD=$(ICUDATA)^\ DATA_PATH=$(ICUP)\data^\ +NATIVE_ARM= +!IF "$(PROCESSOR_ARCHITECTURE)" == "ARM64" || "$(PROCESSOR_ARCHITEW6432)" == "ARM64" +NATIVE_ARM=ARM64 +!ELSE IF "$(PROCESSOR_ARCHITECTURE)" == "ARM" || "$(PROCESSOR_ARCHITEW6432)" == "ARM" +NATIVE_ARM=ARM +!ENDIF + # Use the x64 tools for building ARM and ARM64. # Note: This is similar to the TOOLS CFG PATH in source\data\makedata.mak +!IF "$(NATIVE_ARM)" == "" !IF "$(CFG)" == "x64\Release" || "$(CFG)" == "x64\Debug" || "$(CFG)" == "ARM\Release" || "$(CFG)" == "ARM\Debug" || "$(CFG)" == "ARM64\Release" || "$(CFG)" == "ARM64\Debug" ICUTOOLS=$(ICUP)\bin64 PATH = $(ICUP)\bin64;$(PATH) @@ -60,6 +68,15 @@ PATH = $(ICUP)\bin64;$(PATH) ICUTOOLS=$(ICUP)\bin PATH = $(ICUP)\bin;$(PATH) !ENDIF +!ELSE +!IF "$(CFG)" == "ARM\Release" || "$(CFG)" == "ARM\Debug" +ICUTOOLS=$(ICUP)\binARM +PATH = $(ICUP)\binARM;$(PATH) +!ELSE +ICUTOOLS=$(ICUP)\binARM64 +PATH = $(ICUP)\binARM64;$(PATH) +!ENDIF +!ENDIF # If building ARM/ARM, then we need to pass the arch as an argument. EXTRA_PKGDATA_ARGUMENTS= |