Rename "overrides" to "custom."

This helps shift the emphasis from "replacing existing files" to "adding
missing files," without ruling either option out.
This commit is contained in:
Joseph Cloutier
2022-05-22 23:27:47 -04:00
parent 55f3e74596
commit 87e779b971
44 changed files with 58 additions and 57 deletions

View File

@@ -5,7 +5,7 @@
<depend name="${NATIVE_TOOLKIT_PATH}/freetype/include/freetype/config/ftconfig.h" />
<depend name="${NATIVE_TOOLKIT_PATH}/freetype/include/freetype/config/ftheader.h" />
<depend name="${NATIVE_TOOLKIT_PATH}/freetype/include/freetype/config/ftmodule.h" />
<depend name="${NATIVE_TOOLKIT_PATH}/overrides/freetype/include/freetype/config/ftoption.h" />
<depend name="${NATIVE_TOOLKIT_PATH}/custom/freetype/include/freetype/config/ftoption.h" />
<depend name="${NATIVE_TOOLKIT_PATH}/freetype/include/freetype/config/ftstdlib.h" />
<depend name="${NATIVE_TOOLKIT_PATH}/freetype/include/freetype/freetype.h" />
<depend name="${NATIVE_TOOLKIT_PATH}/freetype/include/freetype/ftadvanc.h" />
@@ -50,7 +50,7 @@
<depend name="${NATIVE_TOOLKIT_PATH}/freetype/include/freetype/ttnameid.h" />
<depend name="${NATIVE_TOOLKIT_PATH}/freetype/include/freetype/tttables.h" />
<depend name="${NATIVE_TOOLKIT_PATH}/freetype/include/freetype/tttags.h" />
<depend name="${NATIVE_TOOLKIT_PATH}/overrides/freetype/include/ft2build.h" />
<depend name="${NATIVE_TOOLKIT_PATH}/custom/freetype/include/ft2build.h" />
</files>
@@ -60,7 +60,7 @@
<tag value="${NATIVE_TOOLKIT_OPTIM_TAG}" if="NATIVE_TOOLKIT_OPTIM_TAG" />
<depend files="native-toolkit-freetype-depends" />
<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/overrides/freetype/include" />
<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/custom/freetype/include" />
<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/freetype/include" />
<compilerflag value="-DFT2_BUILD_LIBRARY" />
@@ -68,7 +68,7 @@
<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/harfbuzz/src" if="NATIVE_TOOLKIT_HAVE_HARFBUZZ" />
<compilerflag value="-DNATIVE_TOOLKIT_HAVE_PNG" if="NATIVE_TOOLKIT_HAVE_PNG" />
<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/overrides/png" if="NATIVE_TOOLKIT_HAVE_PNG" />
<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/custom/png" if="NATIVE_TOOLKIT_HAVE_PNG" />
<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/png" if="NATIVE_TOOLKIT_HAVE_PNG" />
<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/zlib" /> <!-- To go with FT_CONFIG_OPTION_SYSTEM_ZLIB -->