diff options
| author | Michael Lutz <michi@icosahedron.de> | 2018-05-27 11:33:45 +0200 |
|---|---|---|
| committer | Michael Lutz <michi@icosahedron.de> | 2018-06-06 21:37:09 +0200 |
| commit | cd966f3810e21ab24b81379ae0837d95376d91b4 (patch) | |
| tree | 3fc4126a6c5fd04c4c57f9b1b46a28647f872c88 | |
| parent | eec3f40931d7a7dc5a82691ee126f3f0ea0ae6a9 (diff) | |
| download | openttd-cd966f3810e21ab24b81379ae0837d95376d91b4.tar.xz | |
Add: [Win32] Uniscribe configure options for MinGW targets.
| -rw-r--r-- | config.lib | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/config.lib b/config.lib index d6ebb68a1..67ec69211 100644 --- a/config.lib +++ b/config.lib @@ -88,6 +88,7 @@ set_default() { with_icu_layout="1" with_icu_sort="1" static_icu="0" + with_uniscribe="1" with_threads="1" with_distcc="1" with_ccache="1" @@ -164,6 +165,7 @@ set_default() { with_icu_layout with_icu_sort static_icu + with_uniscribe with_threads with_distcc with_ccache @@ -401,6 +403,10 @@ detect_params() { --static-libicu) static_icu="1";; --static-libicu=*) static_icu="$optarg";; + --with-uniscribe) with_uniscribe="2";; + --without-uniscribe) with_uniscribe="0";; + --with-uniscribe=*) with_uniscribe="$optarg";; + --disable-builtin-depend) enable_builtin_depend="0";; --enable-builtin-depend) enable_builtin_depend="2";; --enable-builtin-depend=*) enable_builtin_depend="$optarg";; @@ -855,6 +861,28 @@ check_params() { fi fi + if [ "$with_uniscribe" != "0" ]; then + if [ "$os" != "MINGW" ]; then + if [ "$with_uniscribe" != "1" ]; then + log 1 "configure: error: Uniscribe is only supported on native Win32 targets" + exit 1 + fi + with_uniscribe="0" + + log 1 "checking Uniscribe text layout... not Windows, skipping" + else + log 1 "checking Uniscribe text layout... found" + + # Don't use ICU unless forced. + if [ "$with_icu_layout" = "1" ]; then + with_icu_layout="0" + fi + if [ "$with_icu_sort" = "1" ]; then + with_icu_sort="0" + fi + fi + fi + detect_xdg_basedir detect_png detect_freetype @@ -1781,6 +1809,10 @@ make_cflags_and_ldflags() { fi fi + if [ "$with_uniscribe" != "0" ]; then + CFLAGS="$CFLAGS -DWITH_UNISCRIBE" + LIBS="$LIBS -lusp10" + fi if [ "$with_direct_music" != "0" ]; then CFLAGS="$CFLAGS -DWIN32_ENABLE_DIRECTMUSIC_SUPPORT" |