iqbalrifai
/
Aegisub
mirror of https://github.com/odrling/Aegisub
1
0
Fork 0
Code Issues Releases Wiki Activity

meson: update to reflect fixes in dependencies

This commit is contained in:
Ryan 2021-01-09 05:16:32 -05:00 committed by Ryan Lucia
parent bc079922c0
commit a77f7d48df
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.github/workflows/ci.yml vendored
View File

@ -74,8 +74,7 @@ jobs:
- name: Configure (Windows) - name: Configure (Windows)
if: matrix.config.os == 'windows-latest' 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 -Dbuildtype=release
run: meson build -Ddefault_library=static --force-fallback-for=zlib,harfbuzz -Dfreetype2:zlib=system -Dfreetype2:png=enabled -Dfreetype2:default_library=static -Dbuildtype=release
- name: Configure (MacOS) - name: Configure (MacOS)
if: matrix.config.os == 'macos-latest' if: matrix.config.os == 'macos-latest'

2
README.md
View File

@ -32,7 +32,7 @@ All other dependencies are either stored in the repository or are included as su
Building: Building:
1. Clone Aegisub's repository: `git clone https://github.com/TypesettingTools/Aegisub.git` 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` 3. Build with `cd build` and `meson compile`
You should now have a binary at `src/aegisub.exe`. You should now have a binary at `src/aegisub.exe`.

1
subprojects/freetype2.wrap
View File

@ -5,3 +5,4 @@ revision = master
[provide] [provide]
freetype = freetype2_dep freetype = freetype2_dep
freetype2 = freetype2_dep