-
Notifications
You must be signed in to change notification settings - Fork 59
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Disable some optional dependencies of libtiff and freetype (#18)
Summary: **Summary** 1. Disabling lzma, jbig, webp, and zstd Some the dependencies of libtiff cause build errors, cf. issues * #9 * #15 Since these dependencies are not absolutely required for Ocean, let's disable them for now. 2. Disabling harfbuzz On Macs (Intel-based), when `libharfbuzz*.a` exists in a system-level directory, CMake currently selects that version and not the version that comes with Ocean. This causes iOS builds to fail because CMake doesn't seems to notice that's intended for a different platform. To work-around this problem, this diff disables the build and use of harfbuzz altogether. Also, if harfbuzz is not absolutely required by freetype (or Ocean), we should probably remove it completely to reduce build times and complexity. **Testing** Confirm that the build of the third-party libraries and Ocean no longer fails because of missing `JBIG::JBIG` or similar https://github.com/facebookresearch/ocean/blob/main/building_for_macos.md https://github.com/facebookresearch/ocean/blob/main/building_for_ios.md Builds fine on Macs (for macOS and iOS). Testing on Windows, Linux, and Android is still required. Pull Request resolved: #18 Reviewed By: janherling Differential Revision: D59727228 Pulled By: enpe fbshipit-source-id: 5d470c4e77f2c5a963614cbd8f834017f0dee077
- Loading branch information
1 parent
16c00b3
commit 20983f1
Showing
5 changed files
with
14 additions
and
12 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -7,7 +7,7 @@ giflib | |
openxr | ||
tinyxml2 | ||
protozero | ||
harfbuzz | ||
#harfbuzz | ||
mbedtls | ||
libpng | ||
libtiff | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters