cpp/openttd-patchpack/source Changeset - r7294:493f34a5ab4d

Changeset - r7294:493f34a5ab4d

Parent rev.

Child rev.

[Not reviewed]

master

0 3 0

rubidium - 17 years ago 2007-07-20 18:34:21
rubidium@openttd.org

(svn r10642) -Merge (from NoAI): ./configure flag for disabling threading.

3 files changed with 21 insertions and 8 deletions:

config.lib

configure

projects/generate

0 comments (0 inline, 0 general)

config.lib

➞

Show inline comments

@@ @@ -57,14 +57,15 @@ set_default() { @@
 	with_midi=""
 	with_midi_arg=""
 	with_libtimidity="1"
 	with_freetype="1"
 	with_fontconfig="1"
 	with_psp_config="1"
 	with_threads="1"
-	save_params_array="build host cc_build cc_host cxx_build cxx_host windres strip awk lipo os cpu_type revision endian config_log prefix_dir binary_dir data_dir icon_dir personal_dir install_dir enable_debug enable_profiling enable_dedicated enable_network enable_static enable_translator enable_assert enable_strip with_distcc with_ccache 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"
+	save_params_array="build host cc_build cc_host cxx_build cxx_host windres strip awk lipo os cpu_type revision endian config_log prefix_dir binary_dir data_dir icon_dir personal_dir install_dir enable_install enable_debug enable_profiling enable_dedicated enable_network enable_static enable_translator enable_assert enable_strip with_distcc 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 with_threads 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
@@ @@ -242,12 +243,16 @@ detect_params() { @@
 			--with-osx-sysroot=*)         with_osx_sysroot="$optarg";;
 			--without-application-bundle) with_application_bundle="0";;
 			--with-application-bundle)    with_application_bundle="1";;
 			--with-application-bundle=*)  with_application_bundle="$optarg";;
 			--without-threads)            with_threads="0";;
 			--with-threads)               with_threads="1";;
 			--with-threads=*)             with_threads="$optarg";;
 			CC=* | --CC=*)                CC="$optarg";;
 			CXX=* | --CXX=*)              CXX="$optarg";;
 			CFLAGS=* | --CFLAGS=*)        CFLAGS="$optarg";;
 			LDFLAGS=* | --LDFLAGS=*)      LDFLAGS="$optarg";;
 			--ignore-extra-parameters)    ignore_extra_parameters="1";;
@@ @@ -779,12 +784,16 @@ make_cflags_and_ldflags() { @@
 	if [ "$enable_profiling" != "0" ]; then
 		CFLAGS="$CFLAGS -p"
 		LDFLAGS="$LDFLAGS -pg"
 	fi
 	if [ "$with_threads" = "0" ]; then
 		CFLAGS="$CFLAGS -DNO_THREADS"
 	fi
 	# Enable some things only for certain GCC versions
 	cc_version=`$cc_host -dumpversion | cut -c 1,3`
 	if [ $cc_version -ge 29 ]; then
 		CFLAGS="$CFLAGS -Wall -Wno-multichar -Wsign-compare -Wundef"
 		CFLAGS="$CFLAGS -Wwrite-strings -Wpointer-arith"
@@ @@ -816,19 +825,20 @@ make_cflags_and_ldflags() { @@
 		LDFLAGS="$LDFLAGS -mno-cygwin"
 	fi
 	if [ "$os" = "CYGWIN" ] || [ "$os" = "MINGW" ]; then
 		LDFLAGS="$LDFLAGS -Wl,--subsystem,windows"
 		LIBS="$LIBS -lws2_32 -lwinmm -lgdi32 -ldxguid -lole32"
 		# GCC 4.0+ complains about that we break strict-aliasing.
 		#  On most places we don't see how to fix it, and it doesn't
 		#  break anything. So disable strict-aliasing to make the
 		#  compiler all happy.
 		if [ $cc_version -ge 40 ]; then
 			CFLAGS="$CFLAGS -fno-strict-aliasing"
 		fi
 	fi
 	# GCC 4.0+ complains about that we break strict-aliasing.
 	#  On most places we don't see how to fix it, and it doesn't
 	#  break anything. So disable strict-aliasing to make the
 	#  compiler all happy.
 	if [ $cc_version -ge 40 ]; then
 		CFLAGS="$CFLAGS -fno-strict-aliasing"
 	fi
 	if [ "$os" != "CYGWIN" ] && [ "$os" != "FREEBSD" ] && [ "$os" != "OPENBSD" ] && [ "$os" != "MINGW" ] && [ "$os" != "MORPHOS" ] && [ "$os" != "OSX" ] && [ "$os" != "WINCE" ] && [ "$os" != "PSP" ] && [ "$os" != "OS2" ]; then
 		LIBS="$LIBS -lpthread"
 		LIBS="$LIBS -lrt"
 	fi

configure

➞

Show inline comments

@@ @@ -93,12 +93,13 @@ SRCS="`< $ROOT_DIR/source.list tr '\r' ' @@
 		if ($0 == "WIN32"       && "'$os'" != "MINGW" &&
 		                "'$os'" != "CYGWIN" && "'$os'" != "MSVC" ) { next; }
 		if ($0 == "WINCE"       && "'$os'" != "WINCE")             { next; }
 		if ($0 == "MSVC"        && "'$os'" != "MSVC")              { next; }
 		if ($0 == "DIRECTMUSIC" && "'$with_direct_music'" == "0")  { next; }
 		if ($0 == "LIBTIMIDITY" && "'$libtimidity'" == "" )        { next; }
 		if ($0 == "NO_THREADS"  && "'$with_threads'" == "0")       { next; }
 		skip += 1;
 		next;
+	}
 	/^(	*)#/ { next }

projects/generate

➞

Show inline comments

@@ @@ -33,12 +33,13 @@ fi @@
 sdl_config="1"
 png_config="1"
 os="MSVC"
 enable_dedicated="0"
 with_cocoa="0"
 enable_directmusic="1"
 with_threads="1"
 file_prefix="..\\\\src\\\\"
 safety_check() {
 	li=""
 	for i in `cat $1 | grep -v "#\|ottdres.rc\|win32.cpp\|win32_v.cpp" | xargs -n 1 basename | sort`; do
 		if [ "$li" = "$i" ]; then
@@ @@ -81,12 +82,13 @@ load_main_data() { @@
 			if ($0 == "WIN32"       && "'$os'" != "MINGW" &&
 											"'$os'" != "CYGWIN" && "'$os'" != "MSVC" ) { next; }
 			if ($0 == "WINCE"       && "'$os'" != "WINCE")             { next; }
 			if ($0 == "MSVC"        && "'$os'" != "MSVC")              { next; }
 			if ($0 == "DIRECTMUSIC" && "'$enable_directmusic'" != "1") { next; }
 			if ($0 == "LIBTIMIDITY" && "'$libtimidity'" == "" )        { next; }
 			if ($0 == "NO_THREADS"  && "'$with_threads'" == "0")       { next; }
 			skip += 1;
 			next;
+		}
 		/^(	*)#/ {

0 comments (0 inline, 0 general)