[Scummvm-git-logs] scummvm master -> d0545cb65adc2f731f4004f05a67d06fca6ae742

[SupSuper]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
d0545cb65a CI: Enable fribidi


Commit: d0545cb65adc2f731f4004f05a67d06fca6ae742
    https://github.com/scummvm/scummvm/commit/d0545cb65adc2f731f4004f05a67d06fca6ae742
Author: Orgad Shaneh (orgads at gmail.com)
Date: 2021-08-01T08:30:19+01:00

Commit Message:
CI: Enable fribidi

Some of the issues in vcpkg are already resolved.

Changed paths:
    .github/workflows/ci.yml
    devtools/create_project/msvc.cpp


diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index e33ead0e33..58c9d21ad7 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -13,16 +13,14 @@ jobs:
           - platform: win32
             triplet: x86-windows
             arch: x86
-            # fribidi is disabled due to timeouts when installing the package
-            configFlags: --enable-faad --enable-mpeg2 --enable-discord --disable-fribidi
-            vcpkgPackages: 'curl discord-rpc faad2 fluidsynth freetype glew libflac libjpeg-turbo libmad libmpeg2 libogg libpng libtheora libvorbis sdl2 sdl2-net zlib giflib'
+            configFlags: --enable-faad --enable-mpeg2 --enable-discord
+            vcpkgPackages: 'curl discord-rpc faad2 fluidsynth freetype glew libflac libjpeg-turbo libmad libmpeg2 libogg libpng libtheora libvorbis sdl2 sdl2-net zlib giflib fribidi'
             useNasm: 'true'
           - platform: x64
             arch: x64
             triplet: x64-windows
-            # fribidi is disabled due to timeouts when installing the package
-            configFlags: --enable-faad --enable-mpeg2 --enable-discord --disable-fribidi
-            vcpkgPackages: 'curl discord-rpc faad2 fluidsynth freetype glew libflac libjpeg-turbo libmad libmpeg2 libogg libpng libtheora libvorbis sdl2 sdl2-net zlib giflib'
+            configFlags: --enable-faad --enable-mpeg2 --enable-discord
+            vcpkgPackages: 'curl discord-rpc faad2 fluidsynth freetype glew libflac libjpeg-turbo libmad libmpeg2 libogg libpng libtheora libvorbis sdl2 sdl2-net zlib giflib fribidi'
           - platform: arm64
             arch: arm64
             triplet: arm64-windows
diff --git a/devtools/create_project/msvc.cpp b/devtools/create_project/msvc.cpp
index ea43f2bb7c..353fe5be23 100644
--- a/devtools/create_project/msvc.cpp
+++ b/devtools/create_project/msvc.cpp
@@ -59,7 +59,7 @@ std::string MSVCProvider::getLibraryFromFeature(const char *feature, const Build
 		{      "sdl2", "SDL2.lib",                  "SDL2d.lib",     "winmm.lib imm32.lib version.lib setupapi.lib",    0 },
 		{      "libz", "zlib.lib",                  "zlibd.lib",     0,                                                 0 },
 		{       "mad", "mad.lib",                   0,               0,                                                 "libmad.lib" },
-		{   "fribidi", "libfribidi.lib",            0,               0,                                                 0 },
+		{   "fribidi", "fribidi.lib",               0,               0,                                                 0 },
 		{       "ogg", "ogg.lib",                   0,               0,                                                 "libogg_static.lib" },
 		{    "vorbis", "vorbis.lib vorbisfile.lib", 0,               0,                                                 "libvorbisfile_static.lib libvorbis_static.lib" },
 		{      "flac", "FLAC.lib",                  0,               0,                                                 "libFLAC_static.lib win_utf8_io_static.lib" },