diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2e9652425..671e06116 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -74,8 +74,7 @@ jobs: - name: Configure (Windows) if: matrix.config.os == 'windows-latest' - # -Dfreetype2:png=enabled is a workaround for https://savannah.nongnu.org/bugs/?59458 - run: meson build -Ddefault_library=static --force-fallback-for=zlib,harfbuzz -Dfreetype2:zlib=system -Dfreetype2:png=enabled -Dfreetype2:default_library=static -Dbuildtype=release + run: meson build -Ddefault_library=static --force-fallback-for=zlib,harfbuzz -Dbuildtype=release - name: Configure (MacOS) if: matrix.config.os == 'macos-latest' diff --git a/README.md b/README.md index f009c4235..713382f1c 100644 --- a/README.md +++ b/README.md @@ -32,7 +32,7 @@ All other dependencies are either stored in the repository or are included as su Building: 1. Clone Aegisub's repository: `git clone https://github.com/TypesettingTools/Aegisub.git` -2. From the Visual Studio "x64 Native Tools Command Prompt", generate the build directory: `meson build -Ddefault_library=static -Dfreetype2:zlib=system -Dfreetype2:png=enabled -Dfreetype2:default_library=static` +2. From the Visual Studio "x64 Native Tools Command Prompt", generate the build directory: `meson build -Ddefault_library=static` 3. Build with `cd build` and `meson compile` You should now have a binary at `src/aegisub.exe`. diff --git a/subprojects/freetype2.wrap b/subprojects/freetype2.wrap index a86e85e54..d9903f108 100644 --- a/subprojects/freetype2.wrap +++ b/subprojects/freetype2.wrap @@ -5,3 +5,4 @@ revision = master [provide] freetype = freetype2_dep +freetype2 = freetype2_dep