thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

CI: Enable fribidi

Browse source 
Some of the issues in vcpkg are already resolved.
This commit is contained in:
Orgad Shaneh 2021-07-21 07:53:23 +03:00 • committed by Daniel
parent 4ccb0084be
commit d0545cb65a
2 changed files with 5 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

10
.github/workflows/ci.yml vendored
View file

@ -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

2
devtools/create_project/msvc.cpp
View file

@ -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" },