diff options
| author | Lukas Tönne <lukas.toenne@gmail.com> | 2018-08-12 14:52:49 +0300 |
|---|---|---|
| committer | Lukas Tönne <lukas.toenne@gmail.com> | 2018-08-12 14:52:49 +0300 |
| commit | dc2d841b7c50565302af2986d62ddbd29c332acd (patch) | |
| tree | 324f234e56fde77fb80dfdef0c7c21f01968f71b /build_files/build_environment/patches/freetype.diff | |
| parent | 27b28e437d974ebbafa234205941c07aa0ab546c (diff) | |
| parent | 4b6fa4d897a0bb3252b16383492b526d2cef3920 (diff) | |
Merge branch 'blender2.8' into hair_guideshair_guides
Diffstat (limited to 'build_files/build_environment/patches/freetype.diff')
| -rw-r--r-- | build_files/build_environment/patches/freetype.diff | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/build_files/build_environment/patches/freetype.diff b/build_files/build_environment/patches/freetype.diff new file mode 100644 index 00000000000..cf952234795 --- /dev/null +++ b/build_files/build_environment/patches/freetype.diff @@ -0,0 +1,18 @@ +diff -NaurBb b/CMakeLists.txt a/CMakeLists.txt +--- b/CMakeLists.txt 2018-05-01 12:45:46 -0600 ++++ a/CMakeLists.txt 2018-08-08 13:03:22 -0600 +@@ -229,9 +229,12 @@ + endif () + string(REPLACE "/undef " "#undef " + FTCONFIG_H "${FTCONFIG_H}") +- file(WRITE "${PROJECT_BINARY_DIR}/include/freetype/config/ftconfig.h" +- "${FTCONFIG_H}") ++else() ++ file(READ "${PROJECT_SOURCE_DIR}/include/freetype/config/ftconfig.h" ++ FTCONFIG_H) + endif () ++file(WRITE "${PROJECT_BINARY_DIR}/include/freetype/config/ftconfig.h" ++ "${FTCONFIG_H}") + + + # Create the options file |