WIP.

ggarra13 · Feb 8, 2024 · 18dd226 · 18dd226
1 parent e8e7394
commit 18dd226
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/bin/compile_liblcms2_windows.sh b/bin/compile_liblcms2_windows.sh
@@ -42,11 +42,6 @@ if [[ ! -e $INSTALLDIR/lib/liblcms2.lib ]]; then
     # Install development tools
     #
     pacman -Sy --noconfirm
-
-    #
-    # Remove gcc
-    #
-    pacman -R gcc --noconfirm
 
     # pacman -Sy mingw-w64-x86_64-toolchain --noconfirm
 
@@ -63,7 +58,7 @@ if [[ ! -e $INSTALLDIR/lib/liblcms2.lib ]]; then
     # Run configure
     #
     cd LCMS2
-    run_cmd ./configure --enable-shared --disable-static --prefix=$INSTALLDIR
+    run_cmd CC=cl ./configure --enable-shared --disable-static --prefix=$INSTALLDIR
 
     #
     # Compile and install the library

diff --git a/etc/windows_prepare.sh b/etc/windows_prepare.sh
@@ -11,6 +11,13 @@ if [[ -e /usr/bin/link.exe ]]; then
     run_cmd mv /usr/bin/link.exe /usr/bin/link_msys.exe
 fi
 
+if [[ 1 ]]; then
+    echo "Installing meson....."
+    cd $BUILD_DIR
+    wget -c https://github.com/mesonbuild/meson/releases/download/1.3.1/meson-1.3.1-64.msi
+    cmd.exe //c msiexec -i "$BUILD_DIR/meson-1.3.1-64.msi" -quiet -qn -norestart
+    echo "Installed meson....."
+fi
 
 . windows/envvars/envvars.sh