Changeset - r22900:8c390ff2a96b
[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:
0 comments (0 inline, 0 general)
config.lib
Show inline comments
 
@@ -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"
0 comments (0 inline, 0 general)