Changeset - r14208:c4ac4f772e63
[Not reviewed]
master
8 11 0
rubidium - 14 years ago 2010-01-10 13:12:34
rubidium@openttd.org
(svn r18769) -Codechange: replace MiniLZO with the real library. If you're using MSVC update openttd-useful, otherwise make sure you've got liblzo2 and it's development files installed.
13 files changed:
0 comments (0 inline, 0 general)
config.lib
Show inline comments
 
@@ -64,12 +64,13 @@ set_default() {
 
	with_application_bundle="1"
 
	with_menu_entry="1"
 
	with_allegro="1"
 
	with_sdl="1"
 
	with_cocoa="1"
 
	with_zlib="1"
 
	with_lzo2="1"
 
	with_png="1"
 
	enable_builtin_depend="1"
 
	with_makedepend="0"
 
	with_direct_music="1"
 
	with_sort="1"
 
	with_iconv="1"
 
@@ -133,12 +134,13 @@ set_default() {
 
		with_osx_sysroot
 
		with_application_bundle
 
		with_allegro
 
		with_sdl
 
		with_cocoa
 
		with_zlib
 
		with_lzo2
 
		with_png
 
		enable_builtin_depend
 
		with_makedepend
 
		with_direct_music
 
		with_sort
 
		with_iconv
 
@@ -316,12 +318,19 @@ detect_params() {
 
			--with-cocoa=*)               with_cocoa="$optarg";;
 

	
 
			--with-zlib)                  with_zlib="2";;
 
			--without-zlib)               with_zlib="0";;
 
			--with-zlib=*)                with_zlib="$optarg";;
 

	
 
			--with-lzo2)                  with_lzo2="2";;
 
			--without-lzo2)               with_lzo2="0";;
 
			--with-lzo2=*)                with_lzo2="$optarg";;
 
			--with-liblzo2)               with_lzo2="2";;
 
			--without-liblzo2)            with_lzo2="0";;
 
			--with-liblzo2=*)             with_lzo2="$optarg";;
 

	
 
			--with-png)                   with_png="2";;
 
			--without-png)                with_png="0";;
 
			--with-png=*)                 with_png="$optarg";;
 
			--with-libpng)                with_png="2";;
 
			--without-libpng)             with_png="0";;
 
			--with-libpng=*)              with_png="$optarg";;
 
@@ -741,12 +750,28 @@ check_params() {
 
			log 1 "configure: error: no zlib detected"
 
			log 1 " If you want to compile without zlib use --without-zlib as parameter"
 
			exit
 
		fi
 
	fi
 

	
 
	pre_detect_with_lzo2=$with_lzo2
 
	detect_lzo2
 

	
 
	if [ "$with_lzo2" = "0" ] || [ -z "$lzo2" ]; then
 
		log 1 "WARNING: liblzo2 was not detected or disabled"
 
		log 1 "WARNING: OpenTTD doesn't require liblzo2, but it does mean that"
 
		log 1 "WARNING: loading old savegames/scenarios will be disabled."
 
		if [ "$pre_detect_with_lzo2" = "0" ]; then
 
			log 1 "WARNING: We strongly suggest you to install liblzo2."
 
		else
 
			log 1 "configure: error: no liblzo2 detected"
 
			log 1 " If you want to compile without liblzo2 use --without-liblzo2 as parameter"
 
			exit
 
		fi
 
	fi
 

	
 
	detect_png
 
	detect_freetype
 
	detect_fontconfig
 
	detect_icu
 
	detect_pspconfig
 
	detect_libtimidity
 
@@ -1387,12 +1412,21 @@ make_cflags_and_ldflags() {
 
		else
 
			LIBS="$LIBS -lz"
 
		fi
 
		CFLAGS="$CFLAGS -DWITH_ZLIB"
 
	fi
 

	
 
	if [ "$with_lzo2" != "0" ]; then
 
		if [ "$enable_static" != "0" ] && [ "$os" != "OSX" ]; then
 
			LIBS="$LIBS $lzo2"
 
		else
 
			LIBS="$LIBS -llzo2"
 
		fi
 
		CFLAGS="$CFLAGS -DWITH_LZO"
 
	fi
 

	
 
	# 64bit machines need -D_SQ64
 
	if [ "$cpu_type" = "64" ] && [ "$enable_universal" = "0" ]; then
 
		CFLAGS="$CFLAGS -D_SQ64"
 
	fi
 
	CFLAGS="$CFLAGS -I$SCRIPT_SRC_DIR"
 

	
 
@@ -2233,37 +2267,38 @@ EOF
 
}
 

	
 
detect_library() {
 
	# $1 - config-param ($with_zlib value)
 
	# $2 - library name ('zlib', sets $zlib)
 
	# $3 - static library name (libz.a)
 
	# $4 - header name (zlib.h)
 
	# $5 - force static (if non-empty)
 

	
 
	if [ -n "$5" ]; then force_static="1"; fi
 
	# $4 - header directory ()
 
	# $5 - header name (zlib.h)
 
	# $6 - force static (if non-empty)
 

	
 
	if [ -n "$6" ]; then force_static="1"; fi
 

	
 
	# 0 means no, 1 is auto-detect, 2 is force
 
	if [ "$1" = "0" ]; then
 
		log 1 "checking $2... disabled"
 

	
 
		eval "$2=\"\""
 
		return 0
 
	fi
 

	
 
	log 2 "detecting $2"
 

	
 
	if [ "$1" = "1" ] || [ "$1" = "" ] || [ "$1" = "2" ]; then
 
		eval "$2=`ls -1 /usr/include/*.h 2>/dev/null | egrep \"\/$4\$\"`"
 
		eval "$2=`ls -1 /usr/include/$4*.h 2>/dev/null | egrep \"\/$5\$\"`"
 
		eval "res=\$$2"
 
		if [ -z "$res" ]; then
 
			log 2 "  trying /usr/include/$4... no"
 
			eval "$2=`ls -1 /usr/local/include/*.h 2>/dev/null | egrep \"\/$4\$\"`"
 
			log 2 "  trying /usr/include/$4$5... no"
 
			eval "$2=`ls -1 /usr/local/include/$4*.h 2>/dev/null | egrep \"\/$5\$\"`"
 
		fi
 
		eval "res=\$$2"
 
		if [ -z "$res" ]; then
 
			log 2 "  trying /usr/local/include/$4... no"
 
			log 2 "  trying /usr/local/include/$4$5... no"
 
		fi
 

	
 
		eval "res=\$$2"
 
		if [ -n "$res" ] && ( [ -n "$force_static" ] || ( [ "$enable_static" != "0" ] && [ "$os" != "OSX" ] ) ); then
 
			eval "res=\$$2"
 
			log 2 "  trying $res... found"
 
@@ -2320,17 +2355,21 @@ detect_library() {
 
	log 2 "  trying $res... found"
 

	
 
	log 1 "checking $2... found"
 
}
 

	
 
detect_zlib() {
 
	detect_library "$with_zlib" "zlib" "libz.a" "zlib.h"
 
	detect_library "$with_zlib" "zlib" "libz.a" "" "zlib.h"
 
}
 

	
 
detect_lzo2() {
 
	detect_library "$with_lzo2" "lzo2" "liblzo2.a" "lzo/" "lzo1x.h"
 
}
 

	
 
detect_libtimidity() {
 
	detect_library "$with_libtimidity" "libtimidity" "libtimidity.a" "timidity.h"
 
	detect_library "$with_libtimidity" "libtimidity" "" "libtimidity.a" "timidity.h"
 
}
 

	
 
detect_png() {
 
	# 0 means no, 1 is auto-detect, 2 is force
 
	if [ "$with_png" = "0" ]; then
 
		log 1 "checking libpng... disabled"
 
@@ -3110,12 +3149,13 @@ showhelp() {
 
	echo "                                 midi-player"
 
	echo "  --with-allegrol[=allegro-config]"
 
	echo "                                 enables Allegro video driver support"
 
	echo "  --with-cocoa                   enables COCOA video driver (OSX ONLY)"
 
	echo "  --with-sdl[=sdl-config]        enables SDL video driver support"
 
	echo "  --with-zlib[=zlib.a]           enables zlib support"
 
	echo "  --with-liblzo2[=liblzo2.a]     enables liblzo2 support"
 
	echo "  --with-png[=libpng-config]     enables libpng support"
 
	echo "  --with-freetype[=freetype-config]"
 
	echo "                                 enables libfreetype support"
 
	echo "  --with-fontconfig[=pkg-config fontconfig]"
 
	echo "                                 enables fontconfig support"
 
	echo "  --with-icu[=icu-config]        enables icu (used for right-to-left support)"
os/debian/control
Show inline comments
 
Source: openttd
 
Section: contrib/games
 
Priority: optional
 
Maintainer: Matthijs Kooijman <matthijs@stdin.nl>
 
Uploaders: Jordi Mallach <jordi@debian.org>
 
Build-Depends: debhelper (>= 4.0.0), libsdl-dev, zlib1g-dev, libpng-dev, libfreetype6-dev, libfontconfig-dev
 
Build-Depends: debhelper (>= 4.0.0), libsdl-dev, zlib1g-dev, libpng-dev, libfreetype6-dev, libfontconfig-dev, liblzo2-dev
 
Standards-Version: 3.7.3
 
Vcs-Browser: http://svn.debian.org/wsvn/collab-maint/deb-maint/openttd/trunk/
 
Vcs-Svn: svn://svn.debian.org/svn/collab-maint/deb-maint/openttd/trunk
 
Homepage: http://www.openttd.org/
 

	
 
Package: openttd
projects/openttd_vs80.vcproj
Show inline comments
 
@@ -57,13 +57,13 @@
 
				Optimization="3"
 
				InlineFunctionExpansion="2"
 
				EnableIntrinsicFunctions="true"
 
				FavorSizeOrSpeed="2"
 
				OmitFramePointers="true"
 
				AdditionalIncludeDirectories="..\objs\langs;..\src\3rdparty\squirrel\include"
 
				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_PNG;WITH_FREETYPE;WITH_ICU;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;;WITH_ASSERT"
 
				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_LZO;WITH_PNG;WITH_FREETYPE;WITH_ICU;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;;WITH_ASSERT"
 
				StringPooling="true"
 
				ExceptionHandling="1"
 
				RuntimeLibrary="0"
 
				StructMemberAlignment="3"
 
				BufferSecurityCheck="false"
 
				EnableFunctionLevelLinking="true"
 
@@ -94,13 +94,13 @@
 
			/>
 
			<Tool
 
				Name="VCPreLinkEventTool"
 
			/>
 
			<Tool
 
				Name="VCLinkerTool"
 
				AdditionalDependencies="winmm.lib ws2_32.lib libpng.lib zlibstat.lib dxguid.lib libfreetype2.lib libicu.lib"
 
				AdditionalDependencies="winmm.lib ws2_32.lib libpng.lib zlibstat.lib lzo2.lib dxguid.lib libfreetype2.lib libicu.lib"
 
				LinkIncremental="1"
 
				SuppressStartupBanner="true"
 
				IgnoreDefaultLibraryNames=""
 
				GenerateDebugInformation="true"
 
				SubSystem="2"
 
				StackReserveSize="1048576"
 
@@ -166,13 +166,13 @@
 
			/>
 
			<Tool
 
				Name="VCCLCompilerTool"
 
				AdditionalOptions="/MP"
 
				Optimization="0"
 
				AdditionalIncludeDirectories="..\objs\langs;..\src\3rdparty\squirrel\include"
 
				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_PNG;WITH_FREETYPE;WITH_ICU;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;"
 
				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_LZO;WITH_PNG;WITH_FREETYPE;WITH_ICU;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;"
 
				BasicRuntimeChecks="3"
 
				RuntimeLibrary="1"
 
				UsePrecompiledHeader="0"
 
				AssemblerListingLocation="$(IntDir)/"
 
				ObjectFile="$(IntDir)/"
 
				ProgramDataBaseFileName="$(IntDir)/$(TargetName).pdb"
 
@@ -194,13 +194,13 @@
 
			/>
 
			<Tool
 
				Name="VCPreLinkEventTool"
 
			/>
 
			<Tool
 
				Name="VCLinkerTool"
 
				AdditionalDependencies="winmm.lib ws2_32.lib libpng.lib zlibstat.lib dxguid.lib libfreetype2.lib libicu.lib"
 
				AdditionalDependencies="winmm.lib ws2_32.lib libpng.lib zlibstat.lib lzo2.lib dxguid.lib libfreetype2.lib libicu.lib"
 
				LinkIncremental="0"
 
				SuppressStartupBanner="true"
 
				IgnoreDefaultLibraryNames="LIBCMT.lib"
 
				GenerateDebugInformation="true"
 
				SubSystem="2"
 
				StackReserveSize="1048576"
 
@@ -270,13 +270,13 @@
 
				Optimization="3"
 
				InlineFunctionExpansion="2"
 
				EnableIntrinsicFunctions="true"
 
				FavorSizeOrSpeed="2"
 
				OmitFramePointers="true"
 
				AdditionalIncludeDirectories="..\objs\langs;..\src\3rdparty\squirrel\include"
 
				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_PNG;WITH_FREETYPE;WITH_ICU;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;;_SQ64;WITH_ASSERT"
 
				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_LZO;WITH_PNG;WITH_FREETYPE;WITH_ICU;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;;_SQ64;WITH_ASSERT"
 
				StringPooling="true"
 
				ExceptionHandling="1"
 
				RuntimeLibrary="0"
 
				StructMemberAlignment="0"
 
				BufferSecurityCheck="false"
 
				EnableFunctionLevelLinking="true"
 
@@ -307,13 +307,13 @@
 
			/>
 
			<Tool
 
				Name="VCPreLinkEventTool"
 
			/>
 
			<Tool
 
				Name="VCLinkerTool"
 
				AdditionalDependencies="winmm.lib ws2_32.lib libpng.lib zlibstat.lib dxguid.lib libfreetype2.lib libicu.lib"
 
				AdditionalDependencies="winmm.lib ws2_32.lib libpng.lib zlibstat.lib lzo2.lib dxguid.lib libfreetype2.lib libicu.lib"
 
				LinkIncremental="1"
 
				SuppressStartupBanner="true"
 
				IgnoreDefaultLibraryNames=""
 
				GenerateDebugInformation="true"
 
				SubSystem="2"
 
				StackReserveSize="1048576"
 
@@ -380,13 +380,13 @@
 
			/>
 
			<Tool
 
				Name="VCCLCompilerTool"
 
				AdditionalOptions="/MP"
 
				Optimization="0"
 
				AdditionalIncludeDirectories="..\objs\langs;..\src\3rdparty\squirrel\include"
 
				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_PNG;WITH_FREETYPE;WITH_ICU;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;;_SQ64"
 
				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_LZO;WITH_PNG;WITH_FREETYPE;WITH_ICU;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;;_SQ64"
 
				BasicRuntimeChecks="3"
 
				RuntimeLibrary="1"
 
				UsePrecompiledHeader="0"
 
				PrecompiledHeaderThrough=""
 
				PrecompiledHeaderFile=""
 
				AssemblerListingLocation="$(IntDir)/"
 
@@ -410,13 +410,13 @@
 
			/>
 
			<Tool
 
				Name="VCPreLinkEventTool"
 
			/>
 
			<Tool
 
				Name="VCLinkerTool"
 
				AdditionalDependencies="winmm.lib ws2_32.lib libpng.lib zlibstat.lib dxguid.lib libfreetype2.lib libicu.lib"
 
				AdditionalDependencies="winmm.lib ws2_32.lib libpng.lib zlibstat.lib lzo2.lib dxguid.lib libfreetype2.lib libicu.lib"
 
				LinkIncremental="0"
 
				SuppressStartupBanner="true"
 
				IgnoreDefaultLibraryNames="LIBCMT.lib"
 
				GenerateDebugInformation="true"
 
				SubSystem="2"
 
				StackReserveSize="1048576"
 
@@ -2314,32 +2314,12 @@
 
			<File
 
				RelativePath=".\..\src\3rdparty\md5\md5.h"
 
				>
 
			</File>
 
		</Filter>
 
		<Filter
 
			Name="MiniLZO"
 
			>
 
			<File
 
				RelativePath=".\..\src\3rdparty\minilzo\lzoconf.h"
 
				>
 
			</File>
 
			<File
 
				RelativePath=".\..\src\3rdparty\minilzo\lzodefs.h"
 
				>
 
			</File>
 
			<File
 
				RelativePath=".\..\src\3rdparty\minilzo\minilzo.c"
 
				>
 
			</File>
 
			<File
 
				RelativePath=".\..\src\3rdparty\minilzo\minilzo.h"
 
				>
 
			</File>
 
		</Filter>
 
		<Filter
 
			Name="Script"
 
			>
 
			<File
 
				RelativePath=".\..\src\script\script_info.cpp"
 
				>
 
			</File>
projects/openttd_vs80.vcproj.in
Show inline comments
 
@@ -57,13 +57,13 @@
 
				Optimization="3"
 
				InlineFunctionExpansion="2"
 
				EnableIntrinsicFunctions="true"
 
				FavorSizeOrSpeed="2"
 
				OmitFramePointers="true"
 
				AdditionalIncludeDirectories="..\objs\langs;..\src\3rdparty\squirrel\include"
 
				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_PNG;WITH_FREETYPE;WITH_ICU;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;;WITH_ASSERT"
 
				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_LZO;WITH_PNG;WITH_FREETYPE;WITH_ICU;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;;WITH_ASSERT"
 
				StringPooling="true"
 
				ExceptionHandling="1"
 
				RuntimeLibrary="0"
 
				StructMemberAlignment="3"
 
				BufferSecurityCheck="false"
 
				EnableFunctionLevelLinking="true"
 
@@ -94,13 +94,13 @@
 
			/>
 
			<Tool
 
				Name="VCPreLinkEventTool"
 
			/>
 
			<Tool
 
				Name="VCLinkerTool"
 
				AdditionalDependencies="winmm.lib ws2_32.lib libpng.lib zlibstat.lib dxguid.lib libfreetype2.lib libicu.lib"
 
				AdditionalDependencies="winmm.lib ws2_32.lib libpng.lib zlibstat.lib lzo2.lib dxguid.lib libfreetype2.lib libicu.lib"
 
				LinkIncremental="1"
 
				SuppressStartupBanner="true"
 
				IgnoreDefaultLibraryNames=""
 
				GenerateDebugInformation="true"
 
				SubSystem="2"
 
				StackReserveSize="1048576"
 
@@ -166,13 +166,13 @@
 
			/>
 
			<Tool
 
				Name="VCCLCompilerTool"
 
				AdditionalOptions="/MP"
 
				Optimization="0"
 
				AdditionalIncludeDirectories="..\objs\langs;..\src\3rdparty\squirrel\include"
 
				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_PNG;WITH_FREETYPE;WITH_ICU;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;"
 
				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_LZO;WITH_PNG;WITH_FREETYPE;WITH_ICU;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;"
 
				BasicRuntimeChecks="3"
 
				RuntimeLibrary="1"
 
				UsePrecompiledHeader="0"
 
				AssemblerListingLocation="$(IntDir)/"
 
				ObjectFile="$(IntDir)/"
 
				ProgramDataBaseFileName="$(IntDir)/$(TargetName).pdb"
 
@@ -194,13 +194,13 @@
 
			/>
 
			<Tool
 
				Name="VCPreLinkEventTool"
 
			/>
 
			<Tool
 
				Name="VCLinkerTool"
 
				AdditionalDependencies="winmm.lib ws2_32.lib libpng.lib zlibstat.lib dxguid.lib libfreetype2.lib libicu.lib"
 
				AdditionalDependencies="winmm.lib ws2_32.lib libpng.lib zlibstat.lib lzo2.lib dxguid.lib libfreetype2.lib libicu.lib"
 
				LinkIncremental="0"
 
				SuppressStartupBanner="true"
 
				IgnoreDefaultLibraryNames="LIBCMT.lib"
 
				GenerateDebugInformation="true"
 
				SubSystem="2"
 
				StackReserveSize="1048576"
 
@@ -270,13 +270,13 @@
 
				Optimization="3"
 
				InlineFunctionExpansion="2"
 
				EnableIntrinsicFunctions="true"
 
				FavorSizeOrSpeed="2"
 
				OmitFramePointers="true"
 
				AdditionalIncludeDirectories="..\objs\langs;..\src\3rdparty\squirrel\include"
 
				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_PNG;WITH_FREETYPE;WITH_ICU;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;;_SQ64;WITH_ASSERT"
 
				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_LZO;WITH_PNG;WITH_FREETYPE;WITH_ICU;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;;_SQ64;WITH_ASSERT"
 
				StringPooling="true"
 
				ExceptionHandling="1"
 
				RuntimeLibrary="0"
 
				StructMemberAlignment="0"
 
				BufferSecurityCheck="false"
 
				EnableFunctionLevelLinking="true"
 
@@ -307,13 +307,13 @@
 
			/>
 
			<Tool
 
				Name="VCPreLinkEventTool"
 
			/>
 
			<Tool
 
				Name="VCLinkerTool"
 
				AdditionalDependencies="winmm.lib ws2_32.lib libpng.lib zlibstat.lib dxguid.lib libfreetype2.lib libicu.lib"
 
				AdditionalDependencies="winmm.lib ws2_32.lib libpng.lib zlibstat.lib lzo2.lib dxguid.lib libfreetype2.lib libicu.lib"
 
				LinkIncremental="1"
 
				SuppressStartupBanner="true"
 
				IgnoreDefaultLibraryNames=""
 
				GenerateDebugInformation="true"
 
				SubSystem="2"
 
				StackReserveSize="1048576"
 
@@ -380,13 +380,13 @@
 
			/>
 
			<Tool
 
				Name="VCCLCompilerTool"
 
				AdditionalOptions="/MP"
 
				Optimization="0"
 
				AdditionalIncludeDirectories="..\objs\langs;..\src\3rdparty\squirrel\include"
 
				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_PNG;WITH_FREETYPE;WITH_ICU;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;;_SQ64"
 
				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_LZO;WITH_PNG;WITH_FREETYPE;WITH_ICU;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;;_SQ64"
 
				BasicRuntimeChecks="3"
 
				RuntimeLibrary="1"
 
				UsePrecompiledHeader="0"
 
				PrecompiledHeaderThrough=""
 
				PrecompiledHeaderFile=""
 
				AssemblerListingLocation="$(IntDir)/"
 
@@ -410,13 +410,13 @@
 
			/>
 
			<Tool
 
				Name="VCPreLinkEventTool"
 
			/>
 
			<Tool
 
				Name="VCLinkerTool"
 
				AdditionalDependencies="winmm.lib ws2_32.lib libpng.lib zlibstat.lib dxguid.lib libfreetype2.lib libicu.lib"
 
				AdditionalDependencies="winmm.lib ws2_32.lib libpng.lib zlibstat.lib lzo2.lib dxguid.lib libfreetype2.lib libicu.lib"
 
				LinkIncremental="0"
 
				SuppressStartupBanner="true"
 
				IgnoreDefaultLibraryNames="LIBCMT.lib"
 
				GenerateDebugInformation="true"
 
				SubSystem="2"
 
				StackReserveSize="1048576"
projects/openttd_vs90.vcproj
Show inline comments
 
@@ -58,13 +58,13 @@
 
				Optimization="3"
 
				InlineFunctionExpansion="2"
 
				EnableIntrinsicFunctions="true"
 
				FavorSizeOrSpeed="2"
 
				OmitFramePointers="true"
 
				AdditionalIncludeDirectories="..\objs\langs;..\src\3rdparty\squirrel\include"
 
				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_PNG;WITH_FREETYPE;WITH_ICU;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;;WITH_ASSERT"
 
				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_LZO;WITH_PNG;WITH_FREETYPE;WITH_ICU;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;;WITH_ASSERT"
 
				StringPooling="true"
 
				ExceptionHandling="1"
 
				RuntimeLibrary="0"
 
				StructMemberAlignment="3"
 
				BufferSecurityCheck="false"
 
				EnableFunctionLevelLinking="true"
 
@@ -95,13 +95,13 @@
 
			/>
 
			<Tool
 
				Name="VCPreLinkEventTool"
 
			/>
 
			<Tool
 
				Name="VCLinkerTool"
 
				AdditionalDependencies="winmm.lib ws2_32.lib libpng.lib zlibstat.lib dxguid.lib libfreetype2.lib libicu.lib"
 
				AdditionalDependencies="winmm.lib ws2_32.lib libpng.lib zlibstat.lib lzo2.lib dxguid.lib libfreetype2.lib libicu.lib"
 
				LinkIncremental="1"
 
				SuppressStartupBanner="true"
 
				IgnoreDefaultLibraryNames=""
 
				GenerateDebugInformation="true"
 
				SubSystem="2"
 
				StackReserveSize="1048576"
 
@@ -165,13 +165,13 @@
 
			/>
 
			<Tool
 
				Name="VCCLCompilerTool"
 
				AdditionalOptions="/MP"
 
				Optimization="0"
 
				AdditionalIncludeDirectories="..\objs\langs;..\src\3rdparty\squirrel\include"
 
				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_PNG;WITH_FREETYPE;WITH_ICU;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;"
 
				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_LZO;WITH_PNG;WITH_FREETYPE;WITH_ICU;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;"
 
				BasicRuntimeChecks="3"
 
				RuntimeLibrary="1"
 
				UsePrecompiledHeader="0"
 
				AssemblerListingLocation="$(IntDir)/"
 
				ObjectFile="$(IntDir)/"
 
				ProgramDataBaseFileName="$(IntDir)/$(TargetName).pdb"
 
@@ -193,13 +193,13 @@
 
			/>
 
			<Tool
 
				Name="VCPreLinkEventTool"
 
			/>
 
			<Tool
 
				Name="VCLinkerTool"
 
				AdditionalDependencies="winmm.lib ws2_32.lib libpng.lib zlibstat.lib dxguid.lib libfreetype2.lib libicu.lib"
 
				AdditionalDependencies="winmm.lib ws2_32.lib libpng.lib zlibstat.lib lzo2.lib dxguid.lib libfreetype2.lib libicu.lib"
 
				LinkIncremental="0"
 
				SuppressStartupBanner="true"
 
				IgnoreDefaultLibraryNames="LIBCMT.lib"
 
				GenerateDebugInformation="true"
 
				SubSystem="2"
 
				StackReserveSize="1048576"
 
@@ -268,13 +268,13 @@
 
				Optimization="3"
 
				InlineFunctionExpansion="2"
 
				EnableIntrinsicFunctions="true"
 
				FavorSizeOrSpeed="2"
 
				OmitFramePointers="true"
 
				AdditionalIncludeDirectories="..\objs\langs;..\src\3rdparty\squirrel\include"
 
				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_PNG;WITH_FREETYPE;WITH_ICU;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;;_SQ64;WITH_ASSERT"
 
				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_LZO;WITH_PNG;WITH_FREETYPE;WITH_ICU;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;;_SQ64;WITH_ASSERT"
 
				StringPooling="true"
 
				ExceptionHandling="1"
 
				RuntimeLibrary="0"
 
				StructMemberAlignment="0"
 
				BufferSecurityCheck="false"
 
				EnableFunctionLevelLinking="true"
 
@@ -305,13 +305,13 @@
 
			/>
 
			<Tool
 
				Name="VCPreLinkEventTool"
 
			/>
 
			<Tool
 
				Name="VCLinkerTool"
 
				AdditionalDependencies="winmm.lib ws2_32.lib libpng.lib zlibstat.lib dxguid.lib libfreetype2.lib libicu.lib"
 
				AdditionalDependencies="winmm.lib ws2_32.lib libpng.lib zlibstat.lib lzo2.lib dxguid.lib libfreetype2.lib libicu.lib"
 
				LinkIncremental="1"
 
				SuppressStartupBanner="true"
 
				IgnoreDefaultLibraryNames=""
 
				GenerateDebugInformation="true"
 
				SubSystem="2"
 
				StackReserveSize="1048576"
 
@@ -377,13 +377,13 @@
 
			/>
 
			<Tool
 
				Name="VCCLCompilerTool"
 
				AdditionalOptions="/MP"
 
				Optimization="0"
 
				AdditionalIncludeDirectories="..\objs\langs;..\src\3rdparty\squirrel\include"
 
				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_PNG;WITH_FREETYPE;WITH_ICU;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;;_SQ64"
 
				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_LZO;WITH_PNG;WITH_FREETYPE;WITH_ICU;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;;_SQ64"
 
				BasicRuntimeChecks="3"
 
				RuntimeLibrary="1"
 
				UsePrecompiledHeader="0"
 
				PrecompiledHeaderThrough=""
 
				PrecompiledHeaderFile=""
 
				AssemblerListingLocation="$(IntDir)/"
 
@@ -407,13 +407,13 @@
 
			/>
 
			<Tool
 
				Name="VCPreLinkEventTool"
 
			/>
 
			<Tool
 
				Name="VCLinkerTool"
 
				AdditionalDependencies="winmm.lib ws2_32.lib libpng.lib zlibstat.lib dxguid.lib libfreetype2.lib libicu.lib"
 
				AdditionalDependencies="winmm.lib ws2_32.lib libpng.lib zlibstat.lib lzo2.lib dxguid.lib libfreetype2.lib libicu.lib"
 
				LinkIncremental="0"
 
				SuppressStartupBanner="true"
 
				IgnoreDefaultLibraryNames="LIBCMT.lib"
 
				GenerateDebugInformation="true"
 
				SubSystem="2"
 
				StackReserveSize="1048576"
 
@@ -2311,32 +2311,12 @@
 
			<File
 
				RelativePath=".\..\src\3rdparty\md5\md5.h"
 
				>
 
			</File>
 
		</Filter>
 
		<Filter
 
			Name="MiniLZO"
 
			>
 
			<File
 
				RelativePath=".\..\src\3rdparty\minilzo\lzoconf.h"
 
				>
 
			</File>
 
			<File
 
				RelativePath=".\..\src\3rdparty\minilzo\lzodefs.h"
 
				>
 
			</File>
 
			<File
 
				RelativePath=".\..\src\3rdparty\minilzo\minilzo.c"
 
				>
 
			</File>
 
			<File
 
				RelativePath=".\..\src\3rdparty\minilzo\minilzo.h"
 
				>
 
			</File>
 
		</Filter>
 
		<Filter
 
			Name="Script"
 
			>
 
			<File
 
				RelativePath=".\..\src\script\script_info.cpp"
 
				>
 
			</File>
projects/openttd_vs90.vcproj.in
Show inline comments
 
@@ -58,13 +58,13 @@
 
				Optimization="3"
 
				InlineFunctionExpansion="2"
 
				EnableIntrinsicFunctions="true"
 
				FavorSizeOrSpeed="2"
 
				OmitFramePointers="true"
 
				AdditionalIncludeDirectories="..\objs\langs;..\src\3rdparty\squirrel\include"
 
				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_PNG;WITH_FREETYPE;WITH_ICU;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;;WITH_ASSERT"
 
				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_LZO;WITH_PNG;WITH_FREETYPE;WITH_ICU;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;;WITH_ASSERT"
 
				StringPooling="true"
 
				ExceptionHandling="1"
 
				RuntimeLibrary="0"
 
				StructMemberAlignment="3"
 
				BufferSecurityCheck="false"
 
				EnableFunctionLevelLinking="true"
 
@@ -95,13 +95,13 @@
 
			/>
 
			<Tool
 
				Name="VCPreLinkEventTool"
 
			/>
 
			<Tool
 
				Name="VCLinkerTool"
 
				AdditionalDependencies="winmm.lib ws2_32.lib libpng.lib zlibstat.lib dxguid.lib libfreetype2.lib libicu.lib"
 
				AdditionalDependencies="winmm.lib ws2_32.lib libpng.lib zlibstat.lib lzo2.lib dxguid.lib libfreetype2.lib libicu.lib"
 
				LinkIncremental="1"
 
				SuppressStartupBanner="true"
 
				IgnoreDefaultLibraryNames=""
 
				GenerateDebugInformation="true"
 
				SubSystem="2"
 
				StackReserveSize="1048576"
 
@@ -165,13 +165,13 @@
 
			/>
 
			<Tool
 
				Name="VCCLCompilerTool"
 
				AdditionalOptions="/MP"
 
				Optimization="0"
 
				AdditionalIncludeDirectories="..\objs\langs;..\src\3rdparty\squirrel\include"
 
				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_PNG;WITH_FREETYPE;WITH_ICU;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;"
 
				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_LZO;WITH_PNG;WITH_FREETYPE;WITH_ICU;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;"
 
				BasicRuntimeChecks="3"
 
				RuntimeLibrary="1"
 
				UsePrecompiledHeader="0"
 
				AssemblerListingLocation="$(IntDir)/"
 
				ObjectFile="$(IntDir)/"
 
				ProgramDataBaseFileName="$(IntDir)/$(TargetName).pdb"
 
@@ -193,13 +193,13 @@
 
			/>
 
			<Tool
 
				Name="VCPreLinkEventTool"
 
			/>
 
			<Tool
 
				Name="VCLinkerTool"
 
				AdditionalDependencies="winmm.lib ws2_32.lib libpng.lib zlibstat.lib dxguid.lib libfreetype2.lib libicu.lib"
 
				AdditionalDependencies="winmm.lib ws2_32.lib libpng.lib zlibstat.lib lzo2.lib dxguid.lib libfreetype2.lib libicu.lib"
 
				LinkIncremental="0"
 
				SuppressStartupBanner="true"
 
				IgnoreDefaultLibraryNames="LIBCMT.lib"
 
				GenerateDebugInformation="true"
 
				SubSystem="2"
 
				StackReserveSize="1048576"
 
@@ -268,13 +268,13 @@
 
				Optimization="3"
 
				InlineFunctionExpansion="2"
 
				EnableIntrinsicFunctions="true"
 
				FavorSizeOrSpeed="2"
 
				OmitFramePointers="true"
 
				AdditionalIncludeDirectories="..\objs\langs;..\src\3rdparty\squirrel\include"
 
				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_PNG;WITH_FREETYPE;WITH_ICU;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;;_SQ64;WITH_ASSERT"
 
				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_LZO;WITH_PNG;WITH_FREETYPE;WITH_ICU;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;;_SQ64;WITH_ASSERT"
 
				StringPooling="true"
 
				ExceptionHandling="1"
 
				RuntimeLibrary="0"
 
				StructMemberAlignment="0"
 
				BufferSecurityCheck="false"
 
				EnableFunctionLevelLinking="true"
 
@@ -305,13 +305,13 @@
 
			/>
 
			<Tool
 
				Name="VCPreLinkEventTool"
 
			/>
 
			<Tool
 
				Name="VCLinkerTool"
 
				AdditionalDependencies="winmm.lib ws2_32.lib libpng.lib zlibstat.lib dxguid.lib libfreetype2.lib libicu.lib"
 
				AdditionalDependencies="winmm.lib ws2_32.lib libpng.lib zlibstat.lib lzo2.lib dxguid.lib libfreetype2.lib libicu.lib"
 
				LinkIncremental="1"
 
				SuppressStartupBanner="true"
 
				IgnoreDefaultLibraryNames=""
 
				GenerateDebugInformation="true"
 
				SubSystem="2"
 
				StackReserveSize="1048576"
 
@@ -377,13 +377,13 @@
 
			/>
 
			<Tool
 
				Name="VCCLCompilerTool"
 
				AdditionalOptions="/MP"
 
				Optimization="0"
 
				AdditionalIncludeDirectories="..\objs\langs;..\src\3rdparty\squirrel\include"
 
				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_PNG;WITH_FREETYPE;WITH_ICU;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;;_SQ64"
 
				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_LZO;WITH_PNG;WITH_FREETYPE;WITH_ICU;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;;_SQ64"
 
				BasicRuntimeChecks="3"
 
				RuntimeLibrary="1"
 
				UsePrecompiledHeader="0"
 
				PrecompiledHeaderThrough=""
 
				PrecompiledHeaderFile=""
 
				AssemblerListingLocation="$(IntDir)/"
 
@@ -407,13 +407,13 @@
 
			/>
 
			<Tool
 
				Name="VCPreLinkEventTool"
 
			/>
 
			<Tool
 
				Name="VCLinkerTool"
 
				AdditionalDependencies="winmm.lib ws2_32.lib libpng.lib zlibstat.lib dxguid.lib libfreetype2.lib libicu.lib"
 
				AdditionalDependencies="winmm.lib ws2_32.lib libpng.lib zlibstat.lib lzo2.lib dxguid.lib libfreetype2.lib libicu.lib"
 
				LinkIncremental="0"
 
				SuppressStartupBanner="true"
 
				IgnoreDefaultLibraryNames="LIBCMT.lib"
 
				GenerateDebugInformation="true"
 
				SubSystem="2"
 
				StackReserveSize="1048576"
readme.txt
Show inline comments
 
@@ -407,12 +407,13 @@ DOS:
 

	
 
7.1) Required/optional libraries:
 
---- -------------------
 
The following libraries are used by OpenTTD for:
 
  - libSDL/liballegro: hardware access (video, sound, mouse)
 
  - zlib: (de)compressing of savegames
 
  - liblzo2: (de)compressing of old (pre 0.3.0) savegames
 
  - libpng: making screenshots and loading heightmaps
 
  - libfreetype: loading generic fonts and rendering them
 
  - libfontconfig: searching for fonts, resolving font names to actual fonts
 
  - libicu: handling of right-to-left scripts (e.g. Arabic and Persian)
 

	
 
OpenTTD does not require any of the libraries to be present, but without
 
@@ -543,13 +544,12 @@ Thanks to:
 
  Stefan Meißner (sign_de)       - For his work on the console
 
  Mike Ragsdale                  - OpenTTD installer
 
  Cian Duffy (MYOB)              - BeOS port / manual writing
 
  Christian Rosentreter (tokai)  - MorphOS / AmigaOS port
 
  Richard Kempton (RichK67)      - Additional airports, initial TGP implementation
 
  Alberto Demichelis             - Squirrel scripting language
 
  Markus F.X.J. Oberhumer        - MiniLZO for loading old savegames
 
  L. Peter Deutsch               - MD5 implementation
 
  Michael Blunck                 - For revolutionizing TTD with awesome graphics
 
  George                         - Canal graphics
 
  David Dallaston (Pikka)        - Tram tracks
 
  All Translators                - For their support to make OpenTTD a truly international game
 
  Bug Reporters                  - Thanks for all bug reports
source.list
Show inline comments
 
@@ -508,18 +508,12 @@ table/unmovable_land.h
 
table/water_land.h
 

	
 
# MD5
 
3rdparty/md5/md5.cpp
 
3rdparty/md5/md5.h
 

	
 
# MiniLZO
 
3rdparty/minilzo/lzoconf.h
 
3rdparty/minilzo/lzodefs.h
 
3rdparty/minilzo/minilzo.c
 
3rdparty/minilzo/minilzo.h
 

	
 
# Script
 
script/script_info.cpp
 
script/script_info.hpp
 
script/script_scanner.cpp
 
script/script_scanner.hpp
 
script/squirrel.cpp
src/3rdparty/minilzo/COPYING
Show inline comments
 
deleted file
src/3rdparty/minilzo/Makefile
Show inline comments
 
deleted file
src/3rdparty/minilzo/README.LZO
Show inline comments
 
deleted file
src/3rdparty/minilzo/lzoconf.h
Show inline comments
 
deleted file
src/3rdparty/minilzo/lzodefs.h
Show inline comments
 
deleted file

Changeset was too big and was cut off... Show full diff anyway

0 comments (0 inline, 0 general)