Changeset - r6228:1c3b29b83249
[Not reviewed]
master
0 1 0
truelight - 18 years ago 2007-03-06 19:14:15
truelight@openttd.org
(svn r9030) [Config] -Add: added --enable-unicode, which enables unicode (mostly for windows). Enabled by default on WIN32 (makes win9x fail, so use --disable-unicode if you produce binaries for win9x)
1 file changed with 23 insertions and 1 deletions:
0 comments (0 inline, 0 general)
config.lib
Show inline comments
 
@@ -38,12 +38,13 @@ set_default() {
 
	enable_static="1"
 
	enable_translator="0"
 
	enable_assert="1"
 
	enable_strip="1"
 
	enable_universal="1"
 
	enable_osx_g5="0"
 
	enable_unicode="1"
 
	with_osx_sysroot="1"
 
	with_application_bundle="1"
 
	with_sdl="1"
 
	with_cocoa="1"
 
	with_zlib="1"
 
	with_png="1"
 
@@ -55,13 +56,13 @@ set_default() {
 
	with_midi_arg=""
 
	with_libtimidity="1"
 
	with_freetype="1"
 
	with_fontconfig="1"
 
	with_psp_config="1"
 

	
 
	save_params_array="build host cc_build cc_host cxx_build cxx_host windres strip awk lipo os revision endian config_log prefix_dir binary_dir data_dir icon_dir personal_dir install_dir custom_lang_dir second_data_dir enable_install enable_debug enable_profiling enable_dedicated enable_network enable_static enable_translator enable_assert enable_strip with_osx_sysroot enable_universal enable_osx_g5 with_application_bundle with_sdl with_cocoa with_zlib with_png with_makedepend with_direct_music with_sort with_iconv with_midi with_midi_arg with_libtimidity with_freetype with_fontconfig with_psp_config CC CXX CFLAGS LDFLAGS"
 
	save_params_array="build host cc_build cc_host cxx_build cxx_host windres strip awk lipo os revision endian config_log prefix_dir binary_dir data_dir icon_dir personal_dir install_dir custom_lang_dir second_data_dir enable_install enable_debug enable_profiling enable_dedicated enable_network enable_static enable_translator enable_assert enable_strip with_osx_sysroot enable_universal enable_osx_g5 enable_unicode with_application_bundle with_sdl with_cocoa with_zlib with_png with_makedepend with_direct_music with_sort with_iconv with_midi with_midi_arg with_libtimidity with_freetype with_fontconfig with_psp_config CC CXX CFLAGS LDFLAGS"
 
}
 

	
 
detect_params() {
 
	# Walk over all params from the user and override any default settings if
 
	#  needed. This also handles any invalid option.
 
	for p in "$@"; do
 
@@ -165,12 +166,15 @@ detect_params() {
 
			--disable-universal)          enable_universal="0";;
 
			--enable-universal)           enable_universal="2";;
 
			--enable-universal=*)         enable_universal="$optarg";;
 
			--disable-osx-g5)             enable_osx_g5="0";;
 
			--enable-osx-g5)              enable_osx_g5="2";;
 
			--enable-osx-g5=*)            enable_osx_g5="$optarg";;
 
			--disable-unicode)            enable_unicode="0";;
 
			--enable-unicode)             enable_unicode="2";;
 
			--enable-unicode=*)           enable_unicode="$optarg";;
 

	
 
			--with-sdl)                   with_sdl="2";;
 
			--without-sdl)                with_sdl="0";;
 
			--with-sdl=*)                 with_sdl="$optarg";;
 

	
 
			--with-cocoa)                 with_cocoa="2";;
 
@@ -367,12 +371,26 @@ check_params() {
 
			sleep 5
 
		fi
 
	else
 
		log 1 "checking static... no"
 
	fi
 

	
 
	if [ "$enable_unicode" = "1" ]; then
 
		if [ "$os" = "MINGW" ] || [ "$os" = "CYGWIN" ]; then
 
			enable_unicode="2"
 
		else
 
			enable_unicode="0"
 
		fi
 
	fi
 

	
 
	if [ "$enable_unicode" != "0" ]; then
 
		log 1 "checking unicode... yes"
 
	else
 
		log 1 "checking unicode... no"
 
	fi
 

	
 
	# Show what we configured
 
	if [ "$enable_debug" = "0" ]; then
 
		log 1 "using debug level... no"
 
	elif [ "$enable_profiling" != "0" ]; then
 
		log 1 "using debug level... profiling (debug level $enable_debug)"
 
	else
 
@@ -831,12 +849,16 @@ make_cflags_and_ldflags() {
 
	fi
 

	
 
	if [ "$enable_dedicated" != "0" ]; then
 
		CFLAGS="$CFLAGS -DDEDICATED"
 
	fi
 

	
 
	if [ "$enable_unicode" != "0" ]; then
 
		CFLAGS="$CFLAGS -DUNICODE -D_UNICODE"
 
	fi
 

	
 
	if [ "$enable_network" != "0" ]; then
 
		CFLAGS="$CFLAGS -DENABLE_NETWORK"
 

	
 
		if [ "$os" = "BEOS" ]; then
 
			LDFLAGS="$LDFLAGS -lbind -lsocket"
 
		fi
0 comments (0 inline, 0 general)