Skip to content

Commit

Permalink
Remove SDL_ttf and FriBidi mentions from INSTALL.md and the VS Readme
Browse files Browse the repository at this point in the history
[ci skip]
  • Loading branch information
irydacea committed Mar 13, 2021
1 parent 1c40a02 commit 196db7b
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 6 deletions.
5 changes: 0 additions & 5 deletions INSTALL.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ order to build Wesnoth:
* SDL2 >= 2.0.4
* SDL2_image >= 2.0.2 (with PNG and JPEG support)
* SDL2_mixer >= 2.0.0 (with Ogg Vorbis support)
* SDL2_ttf >= 2.0.12
* Fontconfig >= 2.4.1
* Cairo >= 1.10.0
* Pango >= 1.22.0 (with Cairo backend)
Expand All @@ -39,10 +38,6 @@ features:
* GNU history (libreadline):
Command history and history expansion in the built-in Lua console.

* FriBiDi >= 0.10.9:
Bidirectional text support for RTL languages (Hebrew, etc.) in some parts
of the user interface.


## Build Environment

Expand Down
2 changes: 1 addition & 1 deletion projectfiles/VC16/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
* Install [vcpkg](https://github.com/Microsoft/vcpkg).
* Make vcpkg available to Visual Studio with `vcpkg integrate install` (may require admin rights).
* Use vcpkg to install all dependencies:
```vcpkg install sdl2:x64-windows sdl2-image:x64-windows sdl2-image[libjpeg-turbo]:x64-windows sdl2-mixer[libvorbis,dynamic-load]:x64-windows sdl2-ttf:x64-windows bzip2:x64-windows zlib:x64-windows pango:x64-windows cairo:x64-windows fontconfig:x64-windows libvorbis:x64-windows libogg:x64-windows boost-filesystem:x64-windows boost-iostreams:x64-windows boost-locale[icu]:x64-windows boost-random:x64-windows boost-regex[icu]:x64-windows boost-asio:x64-windows boost-program-options:x64-windows boost-system:x64-windows boost-bimap:x64-windows boost-multi-array:x64-windows boost-logic:x64-windows boost-format:x64-windows boost-coroutine:x64-windows boost-context:x64-windows boost-circular-buffer:x64-windows boost-scope-exit:x64-windows```
```vcpkg install sdl2:x64-windows sdl2-image:x64-windows sdl2-image[libjpeg-turbo]:x64-windows sdl2-mixer[libvorbis,dynamic-load]:x64-windows bzip2:x64-windows zlib:x64-windows pango:x64-windows cairo:x64-windows fontconfig:x64-windows libvorbis:x64-windows libogg:x64-windows boost-filesystem:x64-windows boost-iostreams:x64-windows boost-locale[icu]:x64-windows boost-random:x64-windows boost-regex[icu]:x64-windows boost-asio:x64-windows boost-program-options:x64-windows boost-system:x64-windows boost-bimap:x64-windows boost-multi-array:x64-windows boost-logic:x64-windows boost-format:x64-windows boost-coroutine:x64-windows boost-context:x64-windows boost-circular-buffer:x64-windows boost-scope-exit:x64-windows```
* The above dependencies were taken from github actions CI script.
* Given the above will be compiling both the release and, as available, the debug versions of all those libraries and their dependencies, this may take an hour or more. The travis-ci script works around this somewhat by aliasing `make` to `make -j4` in order to force four threads to be used rather than just one thread.

0 comments on commit 196db7b

Please sign in to comment.