cpp/openttd-patchpack/source Changeset - r6312:1eb52919077b

Changeset - r6312:1eb52919077b

Parent rev.

Child rev.

[Not reviewed]

master

0 1 0

rubidium - 17 years ago 2007-03-15 23:26:47
rubidium@openttd.org

(svn r9239) -Fix [FS#682]: PowerMac G5 CPU is not detected (oVRoM).

1 file changed with 2 insertions and 2 deletions:

config.lib

0 comments (0 inline, 0 general)

config.lib

➞

Show inline comments

@@ @@ -560,50 +560,50 @@ check_params() { @@
 			exit 1
 		fi
 		if [ -n "$custom_lang_dir" ] && [ "$second_data_dir" != "${OSXAPP}/Contents/Resources/data/" ]; then
 			log 1 "configure: error: --second-data-dir and --with-application-bundle are not compatible
 			exit 1
 		fi
 		custom_lang_dir="${OSXAPP}/Contents/Resources/lang/"
 		second_data_dir="${OSXAPP}/Contents/Resources/data/"
 # TODO: remove till here
 	else
 		OSXAPP=""
 	fi
 	if [ "$os" = "OSX" ]; then
 		# Test on G5
 		if [ "$enable_osx_g5" != "0" ]; then
 			log 1 "detecting G5... yes (forced)"
 		else
 			# First, are we a real OSX system, else we can't detect it
 			native=`LC_ALL=C uname | tr '[A-Z]' '[a-z]' | grep darwin`
 			# If $host doesn't match $build , we are cross-compiling
 			if [ -n "$native" ] && [ "$build" != "$host" ]; then
 				$cc_build $SRC_DIR/os/macosx/G5_detector.cpp -o G5_detector
 			if [ -n "$native" ] && [ "$build" == "$host" ]; then
 				$cxx_build $SRC_DIR/os/macosx/G5_detector.cpp -o G5_detector
 				res=`./G5_detector`
 				rm -f G5_detector
 				if [ -n "$res" ]; then
 					# This is G5, add flags for it
 					enable_osx_g5="2"
 					log 1 "detecting G5... yes"
 				else
 					enable_osx_g5="0"
 					log 1 "detecting G5... no"
 				fi
 			else
 				enable_osx_g5="0"
 				log 1 "detecting G5... no (cross-compiling)"
 			fi
 		fi
 	else
 		if [ "$enable_osx_g5" != "0" ]; then
 			log 1 "configure: error: OSX G5 selected, but not compiling for OSX"
 			log 1 "configure: error: either select OSX as OS, or deselect OSX G5"
 			exit 1

0 comments (0 inline, 0 general)