fix icu data building

citizenfx · Aug 22, 2024 · d4ebfa8 · d4ebfa8
1 parent eea21ea
commit d4ebfa8
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 0 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -39,6 +39,7 @@ jobs:
           git apply --reject --whitespace=fix ../patches/rename_output.patch
           git apply --reject --whitespace=fix ../patches/version_suffix.patch
           git apply --reject --whitespace=fix ../patches/build_vs_2022.patch
+          git apply --reject --whitespace=fix ../patches/fix_icu_embedding.patch
 
       - name: Build project
         if: runner.os != 'Windows'

diff --git a/patches/fix_icu_embedding.patch b/patches/fix_icu_embedding.patch
@@ -0,0 +1,13 @@
+diff --git forkSrcPrefix/deps/icu-small/source/tools/toolutil/pkg_genc.cpp forkDstPrefix/deps/icu-small/source/tools/toolutil/pkg_genc.cpp
+index 741a8a5228ca6808ea486e765e8165e229cc73fb..f5c621ab151850ad5010df3ebb42f425ec0068c2 100644
+--- forkSrcPrefix/deps/icu-small/source/tools/toolutil/pkg_genc.cpp
++++ forkDstPrefix/deps/icu-small/source/tools/toolutil/pkg_genc.cpp
+@@ -847,7 +847,7 @@ getArchitecture(uint16_t *pCPU, uint16_t *pBits, UBool *pIsBigEndian, const char
+ #   if defined(_M_IX86)
+         *pCPU = IMAGE_FILE_MACHINE_I386;
+ #   else
+-        *pCPU = IMAGE_FILE_MACHINE_UNKNOWN;
++        *pCPU = IMAGE_FILE_MACHINE_AMD64;
+ #   endif
+ #   if defined(_M_IA64) || defined(_M_AMD64) || defined (_M_ARM64)
+         *pBits = 64; // Doesn't seem to be used for anything interesting though?