cpp/openttd-patchpack/source Changeset - r22900:8c390ff2a96b

Changeset - r22900:8c390ff2a96b

Parent rev.

Child rev.

[Not reviewed]

master

0 1 0

Michael Lutz - 6 years ago 2018-05-27 09:33:45
michi@icosahedron.de

Add: [Win32] Uniscribe configure options for MinGW targets.

1 file changed with 32 insertions and 0 deletions:

config.lib

0 comments (0 inline, 0 general)

config.lib

➞

Show inline comments

@@ @@ -85,12 +85,13 @@ set_default() { @@
 	with_libtimidity="1"
 	with_freetype="1"
 	with_fontconfig="1"
 	with_icu_layout="1"
 	with_icu_sort="1"
 	static_icu="0"
 	with_uniscribe="1"
 	with_threads="1"
 	with_distcc="1"
 	with_ccache="1"
 	with_nforenum="1"
 	with_grfcodec="1"
 	with_sse="1"
@@ @@ -161,12 +162,13 @@ set_default() { @@
 		with_libtimidity
 		with_freetype
 		with_fontconfig
 		with_icu_layout
 		with_icu_sort
 		static_icu
 		with_uniscribe
 		with_threads
 		with_distcc
 		with_ccache
 		with_grfcodec
 		with_nforenum
 		with_sse
@@ @@ -398,12 +400,16 @@ detect_params() { @@
 			--with-icu-sort=*)            with_icu_sort="$optarg";;
 			--static-icu)                 static_icu="1";;
 			--static-icu=*)               static_icu="$optarg";;
 			--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";;
 			--with-makedepend)            with_makedepend="2";;
 			--without-makedepend)         with_makedepend="0";;
@@ @@ -852,12 +858,34 @@ check_params() { @@
 			log 1 "configure: error: no liblzo2 detected"
 			log 1 " If you want to compile without liblzo2 use --without-liblzo2 as parameter"
 			exit
 		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
 	detect_fontconfig
 	detect_icu_layout
 	detect_icu_sort
@@ @@ -1778,12 +1806,16 @@ make_cflags_and_ldflags() { @@
 			LIBS="$LIBS `$icu_sort_config --libs --static | tr '\n\r' '  ' | sed s/-licu/-lsicu/g`"
 		else
 			LIBS="$LIBS `$icu_sort_config --libs | tr '\n\r' '  '`"
 		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"
 		# GCC 4.0+ doesn't like the DirectX includes (gives tons of
 		#  warnings on it we won't be able to fix). For now just
 		#  suppress those warnings.

0 comments (0 inline, 0 general)