build with ucrt64 (#2219)

Author: acalcutt

.github/workflows/prebuild.yaml

@@ -228,14 +228,15 @@ jobs:
       # https://github.com/actions/virtual-environments/pull/632
       - uses: msys2/setup-msys2@v2
         with:
+          msystem: UCRT64
           update: true
           path-type: inherit
 
-      - uses: actions/setup-node@v1
+      - uses: actions/setup-node@v3
         with:
           node-version: ${{ matrix.node }}
 
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           ref: ${{ matrix.canvas_tag }}
           # Fetch all commits/all branches so we can checkout the prebuild
@@ -265,11 +266,11 @@ jobs:
 
           copies=$(comm -12 \
             <(cat depends.csv | cut -d ',' -f2 | sed 's/"//g' | tr '[:upper:]' '[:lower:]' | sort) \
-            <(find /mingw64/bin -name '*.dll' -printf "%f\n" | tr '[:upper:]' '[:lower:]' | sort) \
+            <(find /ucrt64/bin -name '*.dll' -printf "%f\n" | tr '[:upper:]' '[:lower:]' | sort) \
           )
 
           for dll in $copies; do
-            cp /mingw64/bin/$dll build/Release
+            cp /ucrt64/bin/$dll build/Release
           done;
 
       - name: Test binary

prebuild/Windows/binding.gyp

@@ -29,33 +29,33 @@
         'NOMINMAX' # allow std::min/max to work
       ],
       'libraries': [
-        'D:/a/_temp/msys64/mingw64/lib/libcairo-2.lib',
-        'D:/a/_temp/msys64/mingw64/lib/libpng16-16.lib',
-        'D:/a/_temp/msys64/mingw64/lib/libjpeg-8.lib',
-        'D:/a/_temp/msys64/mingw64/lib/libpango-1.0-0.lib',
-        'D:/a/_temp/msys64/mingw64/lib/libpangocairo-1.0-0.lib',
-        'D:/a/_temp/msys64/mingw64/lib/libgobject-2.0-0.lib',
-        'D:/a/_temp/msys64/mingw64/lib/libglib-2.0-0.lib',
-        'D:/a/_temp/msys64/mingw64/lib/libturbojpeg.lib',
-        'D:/a/_temp/msys64/mingw64/lib/libgif-7.lib',
-        'D:/a/_temp/msys64/mingw64/lib/libfreetype-6.lib',
-        'D:/a/_temp/msys64/mingw64/lib/librsvg-2-2.lib'
+        'D:/a/_temp/msys64/ucrt64/lib/libcairo-2.lib',
+        'D:/a/_temp/msys64/ucrt64/lib/libpng16-16.lib',
+        'D:/a/_temp/msys64/ucrt64/lib/libjpeg-8.lib',
+        'D:/a/_temp/msys64/ucrt64/lib/libpango-1.0-0.lib',
+        'D:/a/_temp/msys64/ucrt64/lib/libpangocairo-1.0-0.lib',
+        'D:/a/_temp/msys64/ucrt64/lib/libgobject-2.0-0.lib',
+        'D:/a/_temp/msys64/ucrt64/lib/libglib-2.0-0.lib',
+        'D:/a/_temp/msys64/ucrt64/lib/libturbojpeg.lib',
+        'D:/a/_temp/msys64/ucrt64/lib/libgif-7.lib',
+        'D:/a/_temp/msys64/ucrt64/lib/libfreetype-6.lib',
+        'D:/a/_temp/msys64/ucrt64/lib/librsvg-2-2.lib'
       ],
       'include_dirs': [
         '<!(node -e "require(\'nan\')")',
-        'D:/a/_temp/msys64/mingw64/include',
-        'D:/a/_temp/msys64/mingw64/include/harfbuzz',
-        'D:/a/_temp/msys64/mingw64/include/pango-1.0',
-        'D:/a/_temp/msys64/mingw64/include/cairo',
-        'D:/a/_temp/msys64/mingw64/include/libpng16',
-        'D:/a/_temp/msys64/mingw64/include/glib-2.0',
-        'D:/a/_temp/msys64/mingw64/lib/glib-2.0/include',
-        'D:/a/_temp/msys64/mingw64/include/pixman-1',
-        'D:/a/_temp/msys64/mingw64/include/freetype2',
-        'D:/a/_temp/msys64/mingw64/include/fontconfig',
-        'D:/a/_temp/msys64/mingw64/include/librsvg-2.0',
-        'D:/a/_temp/msys64/mingw64/include/gdk-pixbuf-2.0',
-        'D:/a/_temp/msys64/mingw64/include/libgsf-1' # NEW
+        'D:/a/_temp/msys64/ucrt64/include',
+        'D:/a/_temp/msys64/ucrt64/include/harfbuzz',
+        'D:/a/_temp/msys64/ucrt64/include/pango-1.0',
+        'D:/a/_temp/msys64/ucrt64/include/cairo',
+        'D:/a/_temp/msys64/ucrt64/include/libpng16',
+        'D:/a/_temp/msys64/ucrt64/include/glib-2.0',
+        'D:/a/_temp/msys64/ucrt64/lib/glib-2.0/include',
+        'D:/a/_temp/msys64/ucrt64/include/pixman-1',
+        'D:/a/_temp/msys64/ucrt64/include/freetype2',
+        'D:/a/_temp/msys64/ucrt64/include/fontconfig',
+        'D:/a/_temp/msys64/ucrt64/include/librsvg-2.0',
+        'D:/a/_temp/msys64/ucrt64/include/gdk-pixbuf-2.0',
+        'D:/a/_temp/msys64/ucrt64/include/libgsf-1' # NEW
       ],
       'configurations': {
         'Debug': {

prebuild/Windows/preinstall.sh

@@ -7,28 +7,28 @@ deps="cairo-2 png16-16 jpeg-8 pango-1.0-0 pangocairo-1.0-0 gobject-2.0-0 glib-2.
 pacman --noconfirm -S \
   wget \
   unzip \
-  mingw64/mingw-w64-x86_64-binutils \
-  mingw64/mingw-w64-x86_64-tools \
-  mingw64/mingw-w64-x86_64-libjpeg-turbo \
-  mingw64/mingw-w64-x86_64-pango \
-  mingw64/mingw-w64-x86_64-cairo \
-  mingw64/mingw-w64-x86_64-giflib \
-  mingw64/mingw-w64-x86_64-freetype \
-  mingw64/mingw-w64-x86_64-fontconfig \
-  mingw64/mingw-w64-x86_64-librsvg \
-  mingw64/mingw-w64-x86_64-libxml2 \
-  mingw64/mingw-w64-x86_64-libgsf
+  ucrt64/mingw-w64-ucrt-x86_64-binutils \
+  ucrt64/mingw-w64-ucrt-x86_64-tools \
+  ucrt64/mingw-w64-ucrt-x86_64-libjpeg-turbo \
+  ucrt64/mingw-w64-ucrt-x86_64-pango \
+  ucrt64/mingw-w64-ucrt-x86_64-cairo \
+  ucrt64/mingw-w64-ucrt-x86_64-giflib \
+  ucrt64/mingw-w64-ucrt-x86_64-freetype \
+  ucrt64/mingw-w64-ucrt-x86_64-fontconfig \
+  ucrt64/mingw-w64-ucrt-x86_64-librsvg \
+  ucrt64/mingw-w64-ucrt-x86_64-libxml2 \
+  ucrt64/mingw-w64-ucrt-x86_64-libgsf
 
 # create .lib files for vc++
 
-echo "generating lib files for the MSYS2 dlls"
+echo "generating lib files for the MSYS2 UCRT64 dlls"
 for lib in $deps; do
-  gendef /mingw64/bin/lib$lib.dll > /dev/null 2>&1 || {
+  gendef /ucrt64/bin/lib$lib.dll > /dev/null 2>&1 || {
     echo "could not find lib$lib.dll, have to skip ";
     continue;
   }
 
-  dlltool -d lib$lib.def -l /mingw64/lib/lib$lib.lib > /dev/null 2>&1 || {
+  dlltool -d lib$lib.def -l /ucrt64/lib/lib$lib.lib > /dev/null 2>&1 || {
     echo "could not create dll for lib$lib.dll";
     continue;
   }