Changeset - r12958:ada3af71f45c
[Not reviewed]
master
0 1 0
smatz - 15 years ago 2009-09-07 20:14:56
smatz@openttd.org
(svn r17462) -Cleanup: remove unused variables
1 file changed with 0 insertions and 2 deletions:
0 comments (0 inline, 0 general)
config.lib
Show inline comments
 
@@ -2765,98 +2765,96 @@ generate_main() {
 
	< $ROOT_DIR/Makefile.in sed "$SRC_REPLACE" >> Makefile
 
	cp $ROOT_DIR/Makefile.bundle.in Makefile.bundle
 
	echo "# Auto-generated file -- DO NOT EDIT" > Makefile.am
 
	echo >> Makefile.am
 
	# Make the copy of the source-list, so we don't trigger an unwanted recompile
 
	cp $SOURCE_LIST config.cache.source.list
 
	# Add the current directory, so we don't trigger an unwanted recompile
 
	echo "`pwd`" > config.cache.pwd
 
	# Make sure config.cache is OLDER then config.cache.source.list
 
	touch config.cache
 
	touch config.pwd
 

	
 
	if [ "$menu_dir" != "" ]; then
 
		generate_menu_item
 
	fi
 
}
 

	
 
generate_lang() {
 
	STAGE="[LANG]"
 

	
 
	make_sed
 

	
 
	# Create the language file
 
	mkdir -p $LANG_OBJS_DIR
 

	
 
	log 1 "Generating lang/Makefile..."
 
	echo "# Auto-generated file from 'Makefile.lang.in' -- DO NOT EDIT" > $LANG_OBJS_DIR/Makefile
 
	< $ROOT_DIR/Makefile.lang.in sed "$SRC_REPLACE" >> $LANG_OBJS_DIR/Makefile
 
	echo "DIRS += $LANG_OBJS_DIR" >> Makefile.am
 
	echo "LANG_DIRS += $LANG_OBJS_DIR" >> Makefile.am
 
}
 

	
 
generate_src_normal() {
 
	STAGE=$1
 

	
 
	make_sed
 

	
 
	# Create the source file
 
	mkdir -p $SRC_OBJS_DIR
 

	
 
	log 1 "Generating $2/Makefile..."
 
	echo "# Auto-generated file from 'Makefile.src.in' -- DO NOT EDIT" > $SRC_OBJS_DIR/Makefile
 
	< $ROOT_DIR/Makefile.src.in sed "$SRC_REPLACE" >> $SRC_OBJS_DIR/Makefile
 
	echo "DIRS += $SRC_OBJS_DIR" >> Makefile.am
 
	echo "SRC_DIRS += $SRC_OBJS_DIR" >> Makefile.am
 
}
 

	
 
generate_src_osx() {
 
	CLEAN_CFLAGS="$CFLAGS"
 
	CLEAN_LDFLAGS="$LDFLAGS"
 
	cc_host_orig="$cc_host"
 
	cxx_host_orig="$cxx_host"
 

	
 
	BASE_SRC_OBJS_DIR="$OBJS_DIR/ppc"
 
	cc_host="$cc_host_orig -arch ppc -mmacosx-version-min=10.3"
 
	cxx_host="$cxx_host_orig -arch ppc -mmacosx-version-min=10.3"
 
	generate_src_normal "[PowerPC]" "objs/ppc"
 

	
 
	BASE_SRC_OBJS_DIR="$OBJS_DIR/ppc970"
 
	cc_host="$cc_host_orig -arch ppc970 -mmacosx-version-min=10.3 -mcpu=G5 -mpowerpc64 -mtune=970 -mcpu=970 -mpowerpc-gpopt"
 
	cxx_host="$cxx_host_orig -arch ppc970 -mmacosx-version-min=10.3 -mcpu=G5 -mpowerpc64 -mtune=970 -mcpu=970 -mpowerpc-gpopt"
 
	generate_src_normal "[PowerPC G5]" "objs/ppc970"
 

	
 
	BASE_SRC_OBJS_DIR="$OBJS_DIR/intel"
 
	cc_host="$cc_host_orig -arch i386 -mmacosx-version-min=10.4"
 
	cxx_host="$cxx_host_orig -arch i386 -mmacosx-version-min=10.4"
 
	generate_src_normal "[Intel]" "objs/intel"
 

	
 
	if [ "$enable_universal" = "64" ]; then
 
		# 64 bits is always 10.5 or higher. Furthermore it has a broken ICONV
 
		# and they also removed support for QuickTime/QuickDraw
 
		CFLAGS="$CFLAGS -D_SQ64 -DHAVE_BROKEN_ICONV -DNO_QUICKTIME -UENABLE_COCOA_QUICKDRAW"
 
		LIBS="`echo $LIBS | sed 's/-framework QuickTime//'`"
 

	
 
		BASE_SRC_OBJS_DIR="$OBJS_DIR/ppc64"
 
		cc_host="$cc_host_orig -arch ppc64 -mmacosx-version-min=10.5"
 
		cxx_host="$cxx_host_orig -arch ppc64 -mmacosx-version-min=10.5"
 
		generate_src_normal "[PowerPC 64 bits]" "objs/ppc64"
 

	
 
		BASE_SRC_OBJS_DIR="$OBJS_DIR/intel64"
 
		cc_host="$cc_host_orig -arch x86_64 -mmacosx-version-min=10.5"
 
		cxx_host="$cxx_host_orig -arch x86_64 -mmacosx-version-min=10.5"
 
		generate_src_normal "[Intel 64 bits]" "objs/intel64"
 
	fi
 
}
 

	
 
generate_src() {
 
	if [ "$os" = "OSX" ] && [ "$enable_universal" != "0" ]; then
 
		generate_src_osx
 
	else
 
		generate_src_normal "[SRC]" "objs"
 
	fi
 
}
 

	
 
showhelp() {
 
	echo "'configure' configures OpenTTD."
 
	echo ""
 
	echo "Usage: $0 [OPTION]... [VAR=VALUE]..."
0 comments (0 inline, 0 general)