mirror of https://github.com/OpenTTD/OpenTTD.git
(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.
This commit is contained in:
parent
5afce5831d
commit
3ca0937c1c
58
config.lib
58
config.lib
|
@ -67,6 +67,7 @@ set_default() {
|
||||||
with_sdl="1"
|
with_sdl="1"
|
||||||
with_cocoa="1"
|
with_cocoa="1"
|
||||||
with_zlib="1"
|
with_zlib="1"
|
||||||
|
with_lzo2="1"
|
||||||
with_png="1"
|
with_png="1"
|
||||||
enable_builtin_depend="1"
|
enable_builtin_depend="1"
|
||||||
with_makedepend="0"
|
with_makedepend="0"
|
||||||
|
@ -136,6 +137,7 @@ set_default() {
|
||||||
with_sdl
|
with_sdl
|
||||||
with_cocoa
|
with_cocoa
|
||||||
with_zlib
|
with_zlib
|
||||||
|
with_lzo2
|
||||||
with_png
|
with_png
|
||||||
enable_builtin_depend
|
enable_builtin_depend
|
||||||
with_makedepend
|
with_makedepend
|
||||||
|
@ -319,6 +321,13 @@ detect_params() {
|
||||||
--without-zlib) with_zlib="0";;
|
--without-zlib) with_zlib="0";;
|
||||||
--with-zlib=*) with_zlib="$optarg";;
|
--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";;
|
--with-png) with_png="2";;
|
||||||
--without-png) with_png="0";;
|
--without-png) with_png="0";;
|
||||||
--with-png=*) with_png="$optarg";;
|
--with-png=*) with_png="$optarg";;
|
||||||
|
@ -744,6 +753,22 @@ check_params() {
|
||||||
fi
|
fi
|
||||||
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_png
|
||||||
detect_freetype
|
detect_freetype
|
||||||
detect_fontconfig
|
detect_fontconfig
|
||||||
|
@ -1390,6 +1415,15 @@ make_cflags_and_ldflags() {
|
||||||
CFLAGS="$CFLAGS -DWITH_ZLIB"
|
CFLAGS="$CFLAGS -DWITH_ZLIB"
|
||||||
fi
|
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
|
# 64bit machines need -D_SQ64
|
||||||
if [ "$cpu_type" = "64" ] && [ "$enable_universal" = "0" ]; then
|
if [ "$cpu_type" = "64" ] && [ "$enable_universal" = "0" ]; then
|
||||||
CFLAGS="$CFLAGS -D_SQ64"
|
CFLAGS="$CFLAGS -D_SQ64"
|
||||||
|
@ -2236,10 +2270,11 @@ detect_library() {
|
||||||
# $1 - config-param ($with_zlib value)
|
# $1 - config-param ($with_zlib value)
|
||||||
# $2 - library name ('zlib', sets $zlib)
|
# $2 - library name ('zlib', sets $zlib)
|
||||||
# $3 - static library name (libz.a)
|
# $3 - static library name (libz.a)
|
||||||
# $4 - header name (zlib.h)
|
# $4 - header directory ()
|
||||||
# $5 - force static (if non-empty)
|
# $5 - header name (zlib.h)
|
||||||
|
# $6 - force static (if non-empty)
|
||||||
|
|
||||||
if [ -n "$5" ]; then force_static="1"; fi
|
if [ -n "$6" ]; then force_static="1"; fi
|
||||||
|
|
||||||
# 0 means no, 1 is auto-detect, 2 is force
|
# 0 means no, 1 is auto-detect, 2 is force
|
||||||
if [ "$1" = "0" ]; then
|
if [ "$1" = "0" ]; then
|
||||||
|
@ -2252,15 +2287,15 @@ detect_library() {
|
||||||
log 2 "detecting $2"
|
log 2 "detecting $2"
|
||||||
|
|
||||||
if [ "$1" = "1" ] || [ "$1" = "" ] || [ "$1" = "2" ]; then
|
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"
|
eval "res=\$$2"
|
||||||
if [ -z "$res" ]; then
|
if [ -z "$res" ]; then
|
||||||
log 2 " trying /usr/include/$4... no"
|
log 2 " trying /usr/include/$4$5... no"
|
||||||
eval "$2=`ls -1 /usr/local/include/*.h 2>/dev/null | egrep \"\/$4\$\"`"
|
eval "$2=`ls -1 /usr/local/include/$4*.h 2>/dev/null | egrep \"\/$5\$\"`"
|
||||||
fi
|
fi
|
||||||
eval "res=\$$2"
|
eval "res=\$$2"
|
||||||
if [ -z "$res" ]; then
|
if [ -z "$res" ]; then
|
||||||
log 2 " trying /usr/local/include/$4... no"
|
log 2 " trying /usr/local/include/$4$5... no"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
eval "res=\$$2"
|
eval "res=\$$2"
|
||||||
|
@ -2323,11 +2358,15 @@ detect_library() {
|
||||||
}
|
}
|
||||||
|
|
||||||
detect_zlib() {
|
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_libtimidity() {
|
||||||
detect_library "$with_libtimidity" "libtimidity" "libtimidity.a" "timidity.h"
|
detect_library "$with_libtimidity" "libtimidity" "" "libtimidity.a" "timidity.h"
|
||||||
}
|
}
|
||||||
|
|
||||||
detect_png() {
|
detect_png() {
|
||||||
|
@ -3113,6 +3152,7 @@ showhelp() {
|
||||||
echo " --with-cocoa enables COCOA video driver (OSX ONLY)"
|
echo " --with-cocoa enables COCOA video driver (OSX ONLY)"
|
||||||
echo " --with-sdl[=sdl-config] enables SDL video driver support"
|
echo " --with-sdl[=sdl-config] enables SDL video driver support"
|
||||||
echo " --with-zlib[=zlib.a] enables zlib 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-png[=libpng-config] enables libpng support"
|
||||||
echo " --with-freetype[=freetype-config]"
|
echo " --with-freetype[=freetype-config]"
|
||||||
echo " enables libfreetype support"
|
echo " enables libfreetype support"
|
||||||
|
|
|
@ -3,7 +3,7 @@ Section: contrib/games
|
||||||
Priority: optional
|
Priority: optional
|
||||||
Maintainer: Matthijs Kooijman <matthijs@stdin.nl>
|
Maintainer: Matthijs Kooijman <matthijs@stdin.nl>
|
||||||
Uploaders: Jordi Mallach <jordi@debian.org>
|
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
|
Standards-Version: 3.7.3
|
||||||
Vcs-Browser: http://svn.debian.org/wsvn/collab-maint/deb-maint/openttd/trunk/
|
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
|
Vcs-Svn: svn://svn.debian.org/svn/collab-maint/deb-maint/openttd/trunk
|
||||||
|
|
|
@ -60,7 +60,7 @@
|
||||||
FavorSizeOrSpeed="2"
|
FavorSizeOrSpeed="2"
|
||||||
OmitFramePointers="true"
|
OmitFramePointers="true"
|
||||||
AdditionalIncludeDirectories="..\objs\langs;..\src\3rdparty\squirrel\include"
|
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=\"OpenTTD\";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=\"OpenTTD\";WITH_ASSERT"
|
||||||
StringPooling="true"
|
StringPooling="true"
|
||||||
ExceptionHandling="1"
|
ExceptionHandling="1"
|
||||||
RuntimeLibrary="0"
|
RuntimeLibrary="0"
|
||||||
|
@ -97,7 +97,7 @@
|
||||||
/>
|
/>
|
||||||
<Tool
|
<Tool
|
||||||
Name="VCLinkerTool"
|
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"
|
LinkIncremental="1"
|
||||||
SuppressStartupBanner="true"
|
SuppressStartupBanner="true"
|
||||||
IgnoreDefaultLibraryNames=""
|
IgnoreDefaultLibraryNames=""
|
||||||
|
@ -169,7 +169,7 @@
|
||||||
AdditionalOptions="/MP"
|
AdditionalOptions="/MP"
|
||||||
Optimization="0"
|
Optimization="0"
|
||||||
AdditionalIncludeDirectories="..\objs\langs;..\src\3rdparty\squirrel\include"
|
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=\"OpenTTD\""
|
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=\"OpenTTD\""
|
||||||
BasicRuntimeChecks="3"
|
BasicRuntimeChecks="3"
|
||||||
RuntimeLibrary="1"
|
RuntimeLibrary="1"
|
||||||
UsePrecompiledHeader="0"
|
UsePrecompiledHeader="0"
|
||||||
|
@ -197,7 +197,7 @@
|
||||||
/>
|
/>
|
||||||
<Tool
|
<Tool
|
||||||
Name="VCLinkerTool"
|
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"
|
LinkIncremental="0"
|
||||||
SuppressStartupBanner="true"
|
SuppressStartupBanner="true"
|
||||||
IgnoreDefaultLibraryNames="LIBCMT.lib"
|
IgnoreDefaultLibraryNames="LIBCMT.lib"
|
||||||
|
@ -273,7 +273,7 @@
|
||||||
FavorSizeOrSpeed="2"
|
FavorSizeOrSpeed="2"
|
||||||
OmitFramePointers="true"
|
OmitFramePointers="true"
|
||||||
AdditionalIncludeDirectories="..\objs\langs;..\src\3rdparty\squirrel\include"
|
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=\"OpenTTD\";_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=\"OpenTTD\";_SQ64;WITH_ASSERT"
|
||||||
StringPooling="true"
|
StringPooling="true"
|
||||||
ExceptionHandling="1"
|
ExceptionHandling="1"
|
||||||
RuntimeLibrary="0"
|
RuntimeLibrary="0"
|
||||||
|
@ -310,7 +310,7 @@
|
||||||
/>
|
/>
|
||||||
<Tool
|
<Tool
|
||||||
Name="VCLinkerTool"
|
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"
|
LinkIncremental="1"
|
||||||
SuppressStartupBanner="true"
|
SuppressStartupBanner="true"
|
||||||
IgnoreDefaultLibraryNames=""
|
IgnoreDefaultLibraryNames=""
|
||||||
|
@ -383,7 +383,7 @@
|
||||||
AdditionalOptions="/MP"
|
AdditionalOptions="/MP"
|
||||||
Optimization="0"
|
Optimization="0"
|
||||||
AdditionalIncludeDirectories="..\objs\langs;..\src\3rdparty\squirrel\include"
|
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=\"OpenTTD\";_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=\"OpenTTD\";_SQ64"
|
||||||
BasicRuntimeChecks="3"
|
BasicRuntimeChecks="3"
|
||||||
RuntimeLibrary="1"
|
RuntimeLibrary="1"
|
||||||
UsePrecompiledHeader="0"
|
UsePrecompiledHeader="0"
|
||||||
|
@ -413,7 +413,7 @@
|
||||||
/>
|
/>
|
||||||
<Tool
|
<Tool
|
||||||
Name="VCLinkerTool"
|
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"
|
LinkIncremental="0"
|
||||||
SuppressStartupBanner="true"
|
SuppressStartupBanner="true"
|
||||||
IgnoreDefaultLibraryNames="LIBCMT.lib"
|
IgnoreDefaultLibraryNames="LIBCMT.lib"
|
||||||
|
@ -2316,26 +2316,6 @@
|
||||||
>
|
>
|
||||||
</File>
|
</File>
|
||||||
</Filter>
|
</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
|
<Filter
|
||||||
Name="Script"
|
Name="Script"
|
||||||
>
|
>
|
||||||
|
|
|
@ -60,7 +60,7 @@
|
||||||
FavorSizeOrSpeed="2"
|
FavorSizeOrSpeed="2"
|
||||||
OmitFramePointers="true"
|
OmitFramePointers="true"
|
||||||
AdditionalIncludeDirectories="..\objs\langs;..\src\3rdparty\squirrel\include"
|
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=\"OpenTTD\";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=\"OpenTTD\";WITH_ASSERT"
|
||||||
StringPooling="true"
|
StringPooling="true"
|
||||||
ExceptionHandling="1"
|
ExceptionHandling="1"
|
||||||
RuntimeLibrary="0"
|
RuntimeLibrary="0"
|
||||||
|
@ -97,7 +97,7 @@
|
||||||
/>
|
/>
|
||||||
<Tool
|
<Tool
|
||||||
Name="VCLinkerTool"
|
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"
|
LinkIncremental="1"
|
||||||
SuppressStartupBanner="true"
|
SuppressStartupBanner="true"
|
||||||
IgnoreDefaultLibraryNames=""
|
IgnoreDefaultLibraryNames=""
|
||||||
|
@ -169,7 +169,7 @@
|
||||||
AdditionalOptions="/MP"
|
AdditionalOptions="/MP"
|
||||||
Optimization="0"
|
Optimization="0"
|
||||||
AdditionalIncludeDirectories="..\objs\langs;..\src\3rdparty\squirrel\include"
|
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=\"OpenTTD\""
|
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=\"OpenTTD\""
|
||||||
BasicRuntimeChecks="3"
|
BasicRuntimeChecks="3"
|
||||||
RuntimeLibrary="1"
|
RuntimeLibrary="1"
|
||||||
UsePrecompiledHeader="0"
|
UsePrecompiledHeader="0"
|
||||||
|
@ -197,7 +197,7 @@
|
||||||
/>
|
/>
|
||||||
<Tool
|
<Tool
|
||||||
Name="VCLinkerTool"
|
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"
|
LinkIncremental="0"
|
||||||
SuppressStartupBanner="true"
|
SuppressStartupBanner="true"
|
||||||
IgnoreDefaultLibraryNames="LIBCMT.lib"
|
IgnoreDefaultLibraryNames="LIBCMT.lib"
|
||||||
|
@ -273,7 +273,7 @@
|
||||||
FavorSizeOrSpeed="2"
|
FavorSizeOrSpeed="2"
|
||||||
OmitFramePointers="true"
|
OmitFramePointers="true"
|
||||||
AdditionalIncludeDirectories="..\objs\langs;..\src\3rdparty\squirrel\include"
|
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=\"OpenTTD\";_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=\"OpenTTD\";_SQ64;WITH_ASSERT"
|
||||||
StringPooling="true"
|
StringPooling="true"
|
||||||
ExceptionHandling="1"
|
ExceptionHandling="1"
|
||||||
RuntimeLibrary="0"
|
RuntimeLibrary="0"
|
||||||
|
@ -310,7 +310,7 @@
|
||||||
/>
|
/>
|
||||||
<Tool
|
<Tool
|
||||||
Name="VCLinkerTool"
|
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"
|
LinkIncremental="1"
|
||||||
SuppressStartupBanner="true"
|
SuppressStartupBanner="true"
|
||||||
IgnoreDefaultLibraryNames=""
|
IgnoreDefaultLibraryNames=""
|
||||||
|
@ -383,7 +383,7 @@
|
||||||
AdditionalOptions="/MP"
|
AdditionalOptions="/MP"
|
||||||
Optimization="0"
|
Optimization="0"
|
||||||
AdditionalIncludeDirectories="..\objs\langs;..\src\3rdparty\squirrel\include"
|
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=\"OpenTTD\";_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=\"OpenTTD\";_SQ64"
|
||||||
BasicRuntimeChecks="3"
|
BasicRuntimeChecks="3"
|
||||||
RuntimeLibrary="1"
|
RuntimeLibrary="1"
|
||||||
UsePrecompiledHeader="0"
|
UsePrecompiledHeader="0"
|
||||||
|
@ -413,7 +413,7 @@
|
||||||
/>
|
/>
|
||||||
<Tool
|
<Tool
|
||||||
Name="VCLinkerTool"
|
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"
|
LinkIncremental="0"
|
||||||
SuppressStartupBanner="true"
|
SuppressStartupBanner="true"
|
||||||
IgnoreDefaultLibraryNames="LIBCMT.lib"
|
IgnoreDefaultLibraryNames="LIBCMT.lib"
|
||||||
|
|
|
@ -61,7 +61,7 @@
|
||||||
FavorSizeOrSpeed="2"
|
FavorSizeOrSpeed="2"
|
||||||
OmitFramePointers="true"
|
OmitFramePointers="true"
|
||||||
AdditionalIncludeDirectories="..\objs\langs;..\src\3rdparty\squirrel\include"
|
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=\"OpenTTD\";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=\"OpenTTD\";WITH_ASSERT"
|
||||||
StringPooling="true"
|
StringPooling="true"
|
||||||
ExceptionHandling="1"
|
ExceptionHandling="1"
|
||||||
RuntimeLibrary="0"
|
RuntimeLibrary="0"
|
||||||
|
@ -98,7 +98,7 @@
|
||||||
/>
|
/>
|
||||||
<Tool
|
<Tool
|
||||||
Name="VCLinkerTool"
|
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"
|
LinkIncremental="1"
|
||||||
SuppressStartupBanner="true"
|
SuppressStartupBanner="true"
|
||||||
IgnoreDefaultLibraryNames=""
|
IgnoreDefaultLibraryNames=""
|
||||||
|
@ -168,7 +168,7 @@
|
||||||
AdditionalOptions="/MP"
|
AdditionalOptions="/MP"
|
||||||
Optimization="0"
|
Optimization="0"
|
||||||
AdditionalIncludeDirectories="..\objs\langs;..\src\3rdparty\squirrel\include"
|
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=\"OpenTTD\""
|
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=\"OpenTTD\""
|
||||||
BasicRuntimeChecks="3"
|
BasicRuntimeChecks="3"
|
||||||
RuntimeLibrary="1"
|
RuntimeLibrary="1"
|
||||||
UsePrecompiledHeader="0"
|
UsePrecompiledHeader="0"
|
||||||
|
@ -196,7 +196,7 @@
|
||||||
/>
|
/>
|
||||||
<Tool
|
<Tool
|
||||||
Name="VCLinkerTool"
|
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"
|
LinkIncremental="0"
|
||||||
SuppressStartupBanner="true"
|
SuppressStartupBanner="true"
|
||||||
IgnoreDefaultLibraryNames="LIBCMT.lib"
|
IgnoreDefaultLibraryNames="LIBCMT.lib"
|
||||||
|
@ -271,7 +271,7 @@
|
||||||
FavorSizeOrSpeed="2"
|
FavorSizeOrSpeed="2"
|
||||||
OmitFramePointers="true"
|
OmitFramePointers="true"
|
||||||
AdditionalIncludeDirectories="..\objs\langs;..\src\3rdparty\squirrel\include"
|
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=\"OpenTTD\";_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=\"OpenTTD\";_SQ64;WITH_ASSERT"
|
||||||
StringPooling="true"
|
StringPooling="true"
|
||||||
ExceptionHandling="1"
|
ExceptionHandling="1"
|
||||||
RuntimeLibrary="0"
|
RuntimeLibrary="0"
|
||||||
|
@ -308,7 +308,7 @@
|
||||||
/>
|
/>
|
||||||
<Tool
|
<Tool
|
||||||
Name="VCLinkerTool"
|
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"
|
LinkIncremental="1"
|
||||||
SuppressStartupBanner="true"
|
SuppressStartupBanner="true"
|
||||||
IgnoreDefaultLibraryNames=""
|
IgnoreDefaultLibraryNames=""
|
||||||
|
@ -380,7 +380,7 @@
|
||||||
AdditionalOptions="/MP"
|
AdditionalOptions="/MP"
|
||||||
Optimization="0"
|
Optimization="0"
|
||||||
AdditionalIncludeDirectories="..\objs\langs;..\src\3rdparty\squirrel\include"
|
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=\"OpenTTD\";_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=\"OpenTTD\";_SQ64"
|
||||||
BasicRuntimeChecks="3"
|
BasicRuntimeChecks="3"
|
||||||
RuntimeLibrary="1"
|
RuntimeLibrary="1"
|
||||||
UsePrecompiledHeader="0"
|
UsePrecompiledHeader="0"
|
||||||
|
@ -410,7 +410,7 @@
|
||||||
/>
|
/>
|
||||||
<Tool
|
<Tool
|
||||||
Name="VCLinkerTool"
|
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"
|
LinkIncremental="0"
|
||||||
SuppressStartupBanner="true"
|
SuppressStartupBanner="true"
|
||||||
IgnoreDefaultLibraryNames="LIBCMT.lib"
|
IgnoreDefaultLibraryNames="LIBCMT.lib"
|
||||||
|
@ -2313,26 +2313,6 @@
|
||||||
>
|
>
|
||||||
</File>
|
</File>
|
||||||
</Filter>
|
</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
|
<Filter
|
||||||
Name="Script"
|
Name="Script"
|
||||||
>
|
>
|
||||||
|
|
|
@ -61,7 +61,7 @@
|
||||||
FavorSizeOrSpeed="2"
|
FavorSizeOrSpeed="2"
|
||||||
OmitFramePointers="true"
|
OmitFramePointers="true"
|
||||||
AdditionalIncludeDirectories="..\objs\langs;..\src\3rdparty\squirrel\include"
|
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=\"OpenTTD\";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=\"OpenTTD\";WITH_ASSERT"
|
||||||
StringPooling="true"
|
StringPooling="true"
|
||||||
ExceptionHandling="1"
|
ExceptionHandling="1"
|
||||||
RuntimeLibrary="0"
|
RuntimeLibrary="0"
|
||||||
|
@ -98,7 +98,7 @@
|
||||||
/>
|
/>
|
||||||
<Tool
|
<Tool
|
||||||
Name="VCLinkerTool"
|
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"
|
LinkIncremental="1"
|
||||||
SuppressStartupBanner="true"
|
SuppressStartupBanner="true"
|
||||||
IgnoreDefaultLibraryNames=""
|
IgnoreDefaultLibraryNames=""
|
||||||
|
@ -168,7 +168,7 @@
|
||||||
AdditionalOptions="/MP"
|
AdditionalOptions="/MP"
|
||||||
Optimization="0"
|
Optimization="0"
|
||||||
AdditionalIncludeDirectories="..\objs\langs;..\src\3rdparty\squirrel\include"
|
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=\"OpenTTD\""
|
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=\"OpenTTD\""
|
||||||
BasicRuntimeChecks="3"
|
BasicRuntimeChecks="3"
|
||||||
RuntimeLibrary="1"
|
RuntimeLibrary="1"
|
||||||
UsePrecompiledHeader="0"
|
UsePrecompiledHeader="0"
|
||||||
|
@ -196,7 +196,7 @@
|
||||||
/>
|
/>
|
||||||
<Tool
|
<Tool
|
||||||
Name="VCLinkerTool"
|
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"
|
LinkIncremental="0"
|
||||||
SuppressStartupBanner="true"
|
SuppressStartupBanner="true"
|
||||||
IgnoreDefaultLibraryNames="LIBCMT.lib"
|
IgnoreDefaultLibraryNames="LIBCMT.lib"
|
||||||
|
@ -271,7 +271,7 @@
|
||||||
FavorSizeOrSpeed="2"
|
FavorSizeOrSpeed="2"
|
||||||
OmitFramePointers="true"
|
OmitFramePointers="true"
|
||||||
AdditionalIncludeDirectories="..\objs\langs;..\src\3rdparty\squirrel\include"
|
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=\"OpenTTD\";_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=\"OpenTTD\";_SQ64;WITH_ASSERT"
|
||||||
StringPooling="true"
|
StringPooling="true"
|
||||||
ExceptionHandling="1"
|
ExceptionHandling="1"
|
||||||
RuntimeLibrary="0"
|
RuntimeLibrary="0"
|
||||||
|
@ -308,7 +308,7 @@
|
||||||
/>
|
/>
|
||||||
<Tool
|
<Tool
|
||||||
Name="VCLinkerTool"
|
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"
|
LinkIncremental="1"
|
||||||
SuppressStartupBanner="true"
|
SuppressStartupBanner="true"
|
||||||
IgnoreDefaultLibraryNames=""
|
IgnoreDefaultLibraryNames=""
|
||||||
|
@ -380,7 +380,7 @@
|
||||||
AdditionalOptions="/MP"
|
AdditionalOptions="/MP"
|
||||||
Optimization="0"
|
Optimization="0"
|
||||||
AdditionalIncludeDirectories="..\objs\langs;..\src\3rdparty\squirrel\include"
|
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=\"OpenTTD\";_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=\"OpenTTD\";_SQ64"
|
||||||
BasicRuntimeChecks="3"
|
BasicRuntimeChecks="3"
|
||||||
RuntimeLibrary="1"
|
RuntimeLibrary="1"
|
||||||
UsePrecompiledHeader="0"
|
UsePrecompiledHeader="0"
|
||||||
|
@ -410,7 +410,7 @@
|
||||||
/>
|
/>
|
||||||
<Tool
|
<Tool
|
||||||
Name="VCLinkerTool"
|
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"
|
LinkIncremental="0"
|
||||||
SuppressStartupBanner="true"
|
SuppressStartupBanner="true"
|
||||||
IgnoreDefaultLibraryNames="LIBCMT.lib"
|
IgnoreDefaultLibraryNames="LIBCMT.lib"
|
||||||
|
|
|
@ -410,6 +410,7 @@ DOS:
|
||||||
The following libraries are used by OpenTTD for:
|
The following libraries are used by OpenTTD for:
|
||||||
- libSDL/liballegro: hardware access (video, sound, mouse)
|
- libSDL/liballegro: hardware access (video, sound, mouse)
|
||||||
- zlib: (de)compressing of savegames
|
- zlib: (de)compressing of savegames
|
||||||
|
- liblzo2: (de)compressing of old (pre 0.3.0) savegames
|
||||||
- libpng: making screenshots and loading heightmaps
|
- libpng: making screenshots and loading heightmaps
|
||||||
- libfreetype: loading generic fonts and rendering them
|
- libfreetype: loading generic fonts and rendering them
|
||||||
- libfontconfig: searching for fonts, resolving font names to actual fonts
|
- libfontconfig: searching for fonts, resolving font names to actual fonts
|
||||||
|
@ -546,7 +547,6 @@ Thanks to:
|
||||||
Christian Rosentreter (tokai) - MorphOS / AmigaOS port
|
Christian Rosentreter (tokai) - MorphOS / AmigaOS port
|
||||||
Richard Kempton (RichK67) - Additional airports, initial TGP implementation
|
Richard Kempton (RichK67) - Additional airports, initial TGP implementation
|
||||||
Alberto Demichelis - Squirrel scripting language
|
Alberto Demichelis - Squirrel scripting language
|
||||||
Markus F.X.J. Oberhumer - MiniLZO for loading old savegames
|
|
||||||
L. Peter Deutsch - MD5 implementation
|
L. Peter Deutsch - MD5 implementation
|
||||||
Michael Blunck - For revolutionizing TTD with awesome graphics
|
Michael Blunck - For revolutionizing TTD with awesome graphics
|
||||||
George - Canal graphics
|
George - Canal graphics
|
||||||
|
|
|
@ -511,12 +511,6 @@ table/water_land.h
|
||||||
3rdparty/md5/md5.cpp
|
3rdparty/md5/md5.cpp
|
||||||
3rdparty/md5/md5.h
|
3rdparty/md5/md5.h
|
||||||
|
|
||||||
# MiniLZO
|
|
||||||
3rdparty/minilzo/lzoconf.h
|
|
||||||
3rdparty/minilzo/lzodefs.h
|
|
||||||
3rdparty/minilzo/minilzo.c
|
|
||||||
3rdparty/minilzo/minilzo.h
|
|
||||||
|
|
||||||
# Script
|
# Script
|
||||||
script/script_info.cpp
|
script/script_info.cpp
|
||||||
script/script_info.hpp
|
script/script_info.hpp
|
||||||
|
|
|
@ -1,340 +0,0 @@
|
||||||
GNU GENERAL PUBLIC LICENSE
|
|
||||||
Version 2, June 1991
|
|
||||||
|
|
||||||
Copyright (C) 1989, 1991 Free Software Foundation, Inc.
|
|
||||||
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
|
|
||||||
Everyone is permitted to copy and distribute verbatim copies
|
|
||||||
of this license document, but changing it is not allowed.
|
|
||||||
|
|
||||||
Preamble
|
|
||||||
|
|
||||||
The licenses for most software are designed to take away your
|
|
||||||
freedom to share and change it. By contrast, the GNU General Public
|
|
||||||
License is intended to guarantee your freedom to share and change free
|
|
||||||
software--to make sure the software is free for all its users. This
|
|
||||||
General Public License applies to most of the Free Software
|
|
||||||
Foundation's software and to any other program whose authors commit to
|
|
||||||
using it. (Some other Free Software Foundation software is covered by
|
|
||||||
the GNU Library General Public License instead.) You can apply it to
|
|
||||||
your programs, too.
|
|
||||||
|
|
||||||
When we speak of free software, we are referring to freedom, not
|
|
||||||
price. Our General Public Licenses are designed to make sure that you
|
|
||||||
have the freedom to distribute copies of free software (and charge for
|
|
||||||
this service if you wish), that you receive source code or can get it
|
|
||||||
if you want it, that you can change the software or use pieces of it
|
|
||||||
in new free programs; and that you know you can do these things.
|
|
||||||
|
|
||||||
To protect your rights, we need to make restrictions that forbid
|
|
||||||
anyone to deny you these rights or to ask you to surrender the rights.
|
|
||||||
These restrictions translate to certain responsibilities for you if you
|
|
||||||
distribute copies of the software, or if you modify it.
|
|
||||||
|
|
||||||
For example, if you distribute copies of such a program, whether
|
|
||||||
gratis or for a fee, you must give the recipients all the rights that
|
|
||||||
you have. You must make sure that they, too, receive or can get the
|
|
||||||
source code. And you must show them these terms so they know their
|
|
||||||
rights.
|
|
||||||
|
|
||||||
We protect your rights with two steps: (1) copyright the software, and
|
|
||||||
(2) offer you this license which gives you legal permission to copy,
|
|
||||||
distribute and/or modify the software.
|
|
||||||
|
|
||||||
Also, for each author's protection and ours, we want to make certain
|
|
||||||
that everyone understands that there is no warranty for this free
|
|
||||||
software. If the software is modified by someone else and passed on, we
|
|
||||||
want its recipients to know that what they have is not the original, so
|
|
||||||
that any problems introduced by others will not reflect on the original
|
|
||||||
authors' reputations.
|
|
||||||
|
|
||||||
Finally, any free program is threatened constantly by software
|
|
||||||
patents. We wish to avoid the danger that redistributors of a free
|
|
||||||
program will individually obtain patent licenses, in effect making the
|
|
||||||
program proprietary. To prevent this, we have made it clear that any
|
|
||||||
patent must be licensed for everyone's free use or not licensed at all.
|
|
||||||
|
|
||||||
The precise terms and conditions for copying, distribution and
|
|
||||||
modification follow.
|
|
||||||
|
|
||||||
GNU GENERAL PUBLIC LICENSE
|
|
||||||
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
|
|
||||||
|
|
||||||
0. This License applies to any program or other work which contains
|
|
||||||
a notice placed by the copyright holder saying it may be distributed
|
|
||||||
under the terms of this General Public License. The "Program", below,
|
|
||||||
refers to any such program or work, and a "work based on the Program"
|
|
||||||
means either the Program or any derivative work under copyright law:
|
|
||||||
that is to say, a work containing the Program or a portion of it,
|
|
||||||
either verbatim or with modifications and/or translated into another
|
|
||||||
language. (Hereinafter, translation is included without limitation in
|
|
||||||
the term "modification".) Each licensee is addressed as "you".
|
|
||||||
|
|
||||||
Activities other than copying, distribution and modification are not
|
|
||||||
covered by this License; they are outside its scope. The act of
|
|
||||||
running the Program is not restricted, and the output from the Program
|
|
||||||
is covered only if its contents constitute a work based on the
|
|
||||||
Program (independent of having been made by running the Program).
|
|
||||||
Whether that is true depends on what the Program does.
|
|
||||||
|
|
||||||
1. You may copy and distribute verbatim copies of the Program's
|
|
||||||
source code as you receive it, in any medium, provided that you
|
|
||||||
conspicuously and appropriately publish on each copy an appropriate
|
|
||||||
copyright notice and disclaimer of warranty; keep intact all the
|
|
||||||
notices that refer to this License and to the absence of any warranty;
|
|
||||||
and give any other recipients of the Program a copy of this License
|
|
||||||
along with the Program.
|
|
||||||
|
|
||||||
You may charge a fee for the physical act of transferring a copy, and
|
|
||||||
you may at your option offer warranty protection in exchange for a fee.
|
|
||||||
|
|
||||||
2. You may modify your copy or copies of the Program or any portion
|
|
||||||
of it, thus forming a work based on the Program, and copy and
|
|
||||||
distribute such modifications or work under the terms of Section 1
|
|
||||||
above, provided that you also meet all of these conditions:
|
|
||||||
|
|
||||||
a) You must cause the modified files to carry prominent notices
|
|
||||||
stating that you changed the files and the date of any change.
|
|
||||||
|
|
||||||
b) You must cause any work that you distribute or publish, that in
|
|
||||||
whole or in part contains or is derived from the Program or any
|
|
||||||
part thereof, to be licensed as a whole at no charge to all third
|
|
||||||
parties under the terms of this License.
|
|
||||||
|
|
||||||
c) If the modified program normally reads commands interactively
|
|
||||||
when run, you must cause it, when started running for such
|
|
||||||
interactive use in the most ordinary way, to print or display an
|
|
||||||
announcement including an appropriate copyright notice and a
|
|
||||||
notice that there is no warranty (or else, saying that you provide
|
|
||||||
a warranty) and that users may redistribute the program under
|
|
||||||
these conditions, and telling the user how to view a copy of this
|
|
||||||
License. (Exception: if the Program itself is interactive but
|
|
||||||
does not normally print such an announcement, your work based on
|
|
||||||
the Program is not required to print an announcement.)
|
|
||||||
|
|
||||||
These requirements apply to the modified work as a whole. If
|
|
||||||
identifiable sections of that work are not derived from the Program,
|
|
||||||
and can be reasonably considered independent and separate works in
|
|
||||||
themselves, then this License, and its terms, do not apply to those
|
|
||||||
sections when you distribute them as separate works. But when you
|
|
||||||
distribute the same sections as part of a whole which is a work based
|
|
||||||
on the Program, the distribution of the whole must be on the terms of
|
|
||||||
this License, whose permissions for other licensees extend to the
|
|
||||||
entire whole, and thus to each and every part regardless of who wrote it.
|
|
||||||
|
|
||||||
Thus, it is not the intent of this section to claim rights or contest
|
|
||||||
your rights to work written entirely by you; rather, the intent is to
|
|
||||||
exercise the right to control the distribution of derivative or
|
|
||||||
collective works based on the Program.
|
|
||||||
|
|
||||||
In addition, mere aggregation of another work not based on the Program
|
|
||||||
with the Program (or with a work based on the Program) on a volume of
|
|
||||||
a storage or distribution medium does not bring the other work under
|
|
||||||
the scope of this License.
|
|
||||||
|
|
||||||
3. You may copy and distribute the Program (or a work based on it,
|
|
||||||
under Section 2) in object code or executable form under the terms of
|
|
||||||
Sections 1 and 2 above provided that you also do one of the following:
|
|
||||||
|
|
||||||
a) Accompany it with the complete corresponding machine-readable
|
|
||||||
source code, which must be distributed under the terms of Sections
|
|
||||||
1 and 2 above on a medium customarily used for software interchange; or,
|
|
||||||
|
|
||||||
b) Accompany it with a written offer, valid for at least three
|
|
||||||
years, to give any third party, for a charge no more than your
|
|
||||||
cost of physically performing source distribution, a complete
|
|
||||||
machine-readable copy of the corresponding source code, to be
|
|
||||||
distributed under the terms of Sections 1 and 2 above on a medium
|
|
||||||
customarily used for software interchange; or,
|
|
||||||
|
|
||||||
c) Accompany it with the information you received as to the offer
|
|
||||||
to distribute corresponding source code. (This alternative is
|
|
||||||
allowed only for noncommercial distribution and only if you
|
|
||||||
received the program in object code or executable form with such
|
|
||||||
an offer, in accord with Subsection b above.)
|
|
||||||
|
|
||||||
The source code for a work means the preferred form of the work for
|
|
||||||
making modifications to it. For an executable work, complete source
|
|
||||||
code means all the source code for all modules it contains, plus any
|
|
||||||
associated interface definition files, plus the scripts used to
|
|
||||||
control compilation and installation of the executable. However, as a
|
|
||||||
special exception, the source code distributed need not include
|
|
||||||
anything that is normally distributed (in either source or binary
|
|
||||||
form) with the major components (compiler, kernel, and so on) of the
|
|
||||||
operating system on which the executable runs, unless that component
|
|
||||||
itself accompanies the executable.
|
|
||||||
|
|
||||||
If distribution of executable or object code is made by offering
|
|
||||||
access to copy from a designated place, then offering equivalent
|
|
||||||
access to copy the source code from the same place counts as
|
|
||||||
distribution of the source code, even though third parties are not
|
|
||||||
compelled to copy the source along with the object code.
|
|
||||||
|
|
||||||
4. You may not copy, modify, sublicense, or distribute the Program
|
|
||||||
except as expressly provided under this License. Any attempt
|
|
||||||
otherwise to copy, modify, sublicense or distribute the Program is
|
|
||||||
void, and will automatically terminate your rights under this License.
|
|
||||||
However, parties who have received copies, or rights, from you under
|
|
||||||
this License will not have their licenses terminated so long as such
|
|
||||||
parties remain in full compliance.
|
|
||||||
|
|
||||||
5. You are not required to accept this License, since you have not
|
|
||||||
signed it. However, nothing else grants you permission to modify or
|
|
||||||
distribute the Program or its derivative works. These actions are
|
|
||||||
prohibited by law if you do not accept this License. Therefore, by
|
|
||||||
modifying or distributing the Program (or any work based on the
|
|
||||||
Program), you indicate your acceptance of this License to do so, and
|
|
||||||
all its terms and conditions for copying, distributing or modifying
|
|
||||||
the Program or works based on it.
|
|
||||||
|
|
||||||
6. Each time you redistribute the Program (or any work based on the
|
|
||||||
Program), the recipient automatically receives a license from the
|
|
||||||
original licensor to copy, distribute or modify the Program subject to
|
|
||||||
these terms and conditions. You may not impose any further
|
|
||||||
restrictions on the recipients' exercise of the rights granted herein.
|
|
||||||
You are not responsible for enforcing compliance by third parties to
|
|
||||||
this License.
|
|
||||||
|
|
||||||
7. If, as a consequence of a court judgment or allegation of patent
|
|
||||||
infringement or for any other reason (not limited to patent issues),
|
|
||||||
conditions are imposed on you (whether by court order, agreement or
|
|
||||||
otherwise) that contradict the conditions of this License, they do not
|
|
||||||
excuse you from the conditions of this License. If you cannot
|
|
||||||
distribute so as to satisfy simultaneously your obligations under this
|
|
||||||
License and any other pertinent obligations, then as a consequence you
|
|
||||||
may not distribute the Program at all. For example, if a patent
|
|
||||||
license would not permit royalty-free redistribution of the Program by
|
|
||||||
all those who receive copies directly or indirectly through you, then
|
|
||||||
the only way you could satisfy both it and this License would be to
|
|
||||||
refrain entirely from distribution of the Program.
|
|
||||||
|
|
||||||
If any portion of this section is held invalid or unenforceable under
|
|
||||||
any particular circumstance, the balance of the section is intended to
|
|
||||||
apply and the section as a whole is intended to apply in other
|
|
||||||
circumstances.
|
|
||||||
|
|
||||||
It is not the purpose of this section to induce you to infringe any
|
|
||||||
patents or other property right claims or to contest validity of any
|
|
||||||
such claims; this section has the sole purpose of protecting the
|
|
||||||
integrity of the free software distribution system, which is
|
|
||||||
implemented by public license practices. Many people have made
|
|
||||||
generous contributions to the wide range of software distributed
|
|
||||||
through that system in reliance on consistent application of that
|
|
||||||
system; it is up to the author/donor to decide if he or she is willing
|
|
||||||
to distribute software through any other system and a licensee cannot
|
|
||||||
impose that choice.
|
|
||||||
|
|
||||||
This section is intended to make thoroughly clear what is believed to
|
|
||||||
be a consequence of the rest of this License.
|
|
||||||
|
|
||||||
8. If the distribution and/or use of the Program is restricted in
|
|
||||||
certain countries either by patents or by copyrighted interfaces, the
|
|
||||||
original copyright holder who places the Program under this License
|
|
||||||
may add an explicit geographical distribution limitation excluding
|
|
||||||
those countries, so that distribution is permitted only in or among
|
|
||||||
countries not thus excluded. In such case, this License incorporates
|
|
||||||
the limitation as if written in the body of this License.
|
|
||||||
|
|
||||||
9. The Free Software Foundation may publish revised and/or new versions
|
|
||||||
of the General Public License from time to time. Such new versions will
|
|
||||||
be similar in spirit to the present version, but may differ in detail to
|
|
||||||
address new problems or concerns.
|
|
||||||
|
|
||||||
Each version is given a distinguishing version number. If the Program
|
|
||||||
specifies a version number of this License which applies to it and "any
|
|
||||||
later version", you have the option of following the terms and conditions
|
|
||||||
either of that version or of any later version published by the Free
|
|
||||||
Software Foundation. If the Program does not specify a version number of
|
|
||||||
this License, you may choose any version ever published by the Free Software
|
|
||||||
Foundation.
|
|
||||||
|
|
||||||
10. If you wish to incorporate parts of the Program into other free
|
|
||||||
programs whose distribution conditions are different, write to the author
|
|
||||||
to ask for permission. For software which is copyrighted by the Free
|
|
||||||
Software Foundation, write to the Free Software Foundation; we sometimes
|
|
||||||
make exceptions for this. Our decision will be guided by the two goals
|
|
||||||
of preserving the free status of all derivatives of our free software and
|
|
||||||
of promoting the sharing and reuse of software generally.
|
|
||||||
|
|
||||||
NO WARRANTY
|
|
||||||
|
|
||||||
11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
|
|
||||||
FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
|
|
||||||
OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
|
|
||||||
PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
|
|
||||||
OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
|
|
||||||
MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
|
|
||||||
TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
|
|
||||||
PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
|
|
||||||
REPAIR OR CORRECTION.
|
|
||||||
|
|
||||||
12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
|
|
||||||
WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
|
|
||||||
REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
|
|
||||||
INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
|
|
||||||
OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
|
|
||||||
TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
|
|
||||||
YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
|
|
||||||
PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
|
|
||||||
POSSIBILITY OF SUCH DAMAGES.
|
|
||||||
|
|
||||||
END OF TERMS AND CONDITIONS
|
|
||||||
|
|
||||||
How to Apply These Terms to Your New Programs
|
|
||||||
|
|
||||||
If you develop a new program, and you want it to be of the greatest
|
|
||||||
possible use to the public, the best way to achieve this is to make it
|
|
||||||
free software which everyone can redistribute and change under these terms.
|
|
||||||
|
|
||||||
To do so, attach the following notices to the program. It is safest
|
|
||||||
to attach them to the start of each source file to most effectively
|
|
||||||
convey the exclusion of warranty; and each file should have at least
|
|
||||||
the "copyright" line and a pointer to where the full notice is found.
|
|
||||||
|
|
||||||
<one line to give the program's name and a brief idea of what it does.>
|
|
||||||
Copyright (C) 19yy <name of author>
|
|
||||||
|
|
||||||
This program is free software; you can redistribute it and/or modify
|
|
||||||
it under the terms of the GNU General Public License as published by
|
|
||||||
the Free Software Foundation; either version 2 of the License, or
|
|
||||||
(at your option) any later version.
|
|
||||||
|
|
||||||
This program is distributed in the hope that it will be useful,
|
|
||||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
GNU General Public License for more details.
|
|
||||||
|
|
||||||
You should have received a copy of the GNU General Public License
|
|
||||||
along with this program; if not, write to the Free Software
|
|
||||||
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
|
||||||
|
|
||||||
|
|
||||||
Also add information on how to contact you by electronic and paper mail.
|
|
||||||
|
|
||||||
If the program is interactive, make it output a short notice like this
|
|
||||||
when it starts in an interactive mode:
|
|
||||||
|
|
||||||
Gnomovision version 69, Copyright (C) 19yy name of author
|
|
||||||
Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
|
|
||||||
This is free software, and you are welcome to redistribute it
|
|
||||||
under certain conditions; type `show c' for details.
|
|
||||||
|
|
||||||
The hypothetical commands `show w' and `show c' should show the appropriate
|
|
||||||
parts of the General Public License. Of course, the commands you use may
|
|
||||||
be called something other than `show w' and `show c'; they could even be
|
|
||||||
mouse-clicks or menu items--whatever suits your program.
|
|
||||||
|
|
||||||
You should also get your employer (if you work as a programmer) or your
|
|
||||||
school, if any, to sign a "copyright disclaimer" for the program, if
|
|
||||||
necessary. Here is a sample; alter the names:
|
|
||||||
|
|
||||||
Yoyodyne, Inc., hereby disclaims all copyright interest in the program
|
|
||||||
`Gnomovision' (which makes passes at compilers) written by James Hacker.
|
|
||||||
|
|
||||||
<signature of Ty Coon>, 1 April 1989
|
|
||||||
Ty Coon, President of Vice
|
|
||||||
|
|
||||||
This General Public License does not permit incorporating your program into
|
|
||||||
proprietary programs. If your program is a subroutine library, you may
|
|
||||||
consider it more useful to permit linking proprietary applications with the
|
|
||||||
library. If this is what you want to do, use the GNU Library General
|
|
||||||
Public License instead of this License.
|
|
|
@ -1,113 +0,0 @@
|
||||||
#
|
|
||||||
# a very simple Makefile for miniLZO
|
|
||||||
#
|
|
||||||
# Copyright (C) 1996-2008 Markus F.X.J. Oberhumer
|
|
||||||
#
|
|
||||||
|
|
||||||
PROGRAM = testmini
|
|
||||||
SOURCES = testmini.c minilzo.c
|
|
||||||
|
|
||||||
default:
|
|
||||||
@echo "Please choose one of the following targets:"
|
|
||||||
@echo " gcc: gcc"
|
|
||||||
@echo " unix: hpux hpux9"
|
|
||||||
@echo " win32: win32-bc win32-cygwin win32-dm win32-lccwin32"
|
|
||||||
@echo " win32-intelc win32-mingw win32-vc win32-watcomc"
|
|
||||||
@echo " dos16: dos16-bc dos16-mc dos16-wc"
|
|
||||||
@echo " dos32: dos32-djgpp2 dos32-wc"
|
|
||||||
|
|
||||||
|
|
||||||
# Make sure that minilzo.h, lzoconf.h and lzodefs.h are in the
|
|
||||||
# current dircectory. Otherwise you may want to adjust CPPFLAGS.
|
|
||||||
##CPPFLAGS = -I../include/lzo -I.
|
|
||||||
|
|
||||||
GCC_CFLAGS = -s -Wall -O2 -fomit-frame-pointer
|
|
||||||
|
|
||||||
|
|
||||||
#
|
|
||||||
# gcc (generic)
|
|
||||||
#
|
|
||||||
|
|
||||||
gcc:
|
|
||||||
gcc $(CPPFLAGS) $(GCC_CFLAGS) -o $(PROGRAM) $(SOURCES)
|
|
||||||
|
|
||||||
cc:
|
|
||||||
cc $(CPPFLAGS) -o $(PROGRAM) $(SOURCES)
|
|
||||||
|
|
||||||
|
|
||||||
#
|
|
||||||
# UNIX
|
|
||||||
#
|
|
||||||
|
|
||||||
hpux:
|
|
||||||
cc -Ae $(CPPFLAGS) -o $(PROGRAM) $(SOURCES)
|
|
||||||
|
|
||||||
hpux9:
|
|
||||||
cc -Aa -D_HPUX_SOURCE $(CPPFLAGS) -o $(PROGRAM) $(SOURCES)
|
|
||||||
|
|
||||||
|
|
||||||
#
|
|
||||||
# Windows (32-bit)
|
|
||||||
#
|
|
||||||
|
|
||||||
win32-borlandc win32-bc:
|
|
||||||
bcc32 -O2 -d -w -w-aus $(CPPFLAGS) $(SOURCES)
|
|
||||||
|
|
||||||
win32-cygwin32 win32-cygwin:
|
|
||||||
gcc -mcygwin $(CPPFLAGS) $(GCC_CFLAGS) -o $(PROGRAM).exe $(SOURCES)
|
|
||||||
|
|
||||||
win32-digitalmars win32-dm:
|
|
||||||
dmc -mn -o -w- $(CPPFLAGS) $(SOURCES)
|
|
||||||
|
|
||||||
win32-intelc win32-ic:
|
|
||||||
icl -nologo -MD -W3 -O2 -GF $(CPPFLAGS) $(SOURCES)
|
|
||||||
|
|
||||||
win32-lccwin32:
|
|
||||||
@echo "NOTE: need lcc 2002-07-25 or newer, older versions have bugs"
|
|
||||||
lc -A -unused -O $(CPPFLAGS) $(SOURCES)
|
|
||||||
|
|
||||||
win32-mingw32 win32-mingw:
|
|
||||||
gcc -mno-cygwin $(CPPFLAGS) $(GCC_CFLAGS) -o $(PROGRAM).exe $(SOURCES)
|
|
||||||
|
|
||||||
win32-visualc win32-vc:
|
|
||||||
cl -nologo -MD -W3 -O2 -GF $(CPPFLAGS) $(SOURCES)
|
|
||||||
|
|
||||||
win32-watcomc win32-wc:
|
|
||||||
wcl386 -bt=nt -zq -mf -5r -zc -w5 -oneatx $(CPPFLAGS) $(SOURCES)
|
|
||||||
|
|
||||||
|
|
||||||
#
|
|
||||||
# DOS (16-bit)
|
|
||||||
#
|
|
||||||
|
|
||||||
dos16-borlandc dos16-bc:
|
|
||||||
bcc -ml -w -d -O -4 $(CPPFLAGS) $(SOURCES)
|
|
||||||
|
|
||||||
dos16-microsoftc dos16-msc dos16-mc:
|
|
||||||
cl -nologo -f- -AL -O -G2 -W3 $(CPPFLAGS) $(SOURCES)
|
|
||||||
|
|
||||||
dos16-watcomc dos16-wc:
|
|
||||||
wcl -zq -ml -bt=dos -l=dos -ox -w5 $(CPPFLAGS) $(SOURCES)
|
|
||||||
|
|
||||||
|
|
||||||
#
|
|
||||||
# DOS (32-bit)
|
|
||||||
#
|
|
||||||
|
|
||||||
dos32-djgpp2 dos32-dj2:
|
|
||||||
gcc $(CPPFLAGS) $(GCC_CFLAGS) -o $(PROGRAM).exe $(SOURCES)
|
|
||||||
|
|
||||||
dos32-watcomc dos32-wc:
|
|
||||||
wcl386 -zq -mf -bt=dos -l=dos4g -5r -ox -zc $(CPPFLAGS) $(SOURCES)
|
|
||||||
|
|
||||||
|
|
||||||
#
|
|
||||||
# other targets
|
|
||||||
#
|
|
||||||
|
|
||||||
clean:
|
|
||||||
rm -f $(PROGRAM) $(PROGRAM).exe $(PROGRAM).map $(PROGRAM).tds
|
|
||||||
rm -f *.err *.o *.obj
|
|
||||||
|
|
||||||
.PHONY: default clean
|
|
||||||
|
|
|
@ -1,123 +0,0 @@
|
||||||
|
|
||||||
============================================================================
|
|
||||||
miniLZO -- mini subset of the LZO real-time data compression library
|
|
||||||
============================================================================
|
|
||||||
|
|
||||||
Author : Markus Franz Xaver Johannes Oberhumer
|
|
||||||
<markus@oberhumer.com>
|
|
||||||
http://www.oberhumer.com/opensource/lzo/
|
|
||||||
Version : 2.03
|
|
||||||
Date : 30 Apr 2008
|
|
||||||
|
|
||||||
I've created miniLZO for projects where it is inconvenient to
|
|
||||||
include (or require) the full LZO source code just because you
|
|
||||||
want to add a little bit of data compression to your application.
|
|
||||||
|
|
||||||
miniLZO implements the LZO1X-1 compressor and both the standard and
|
|
||||||
safe LZO1X decompressor. Apart from fast compression it also useful
|
|
||||||
for situations where you want to use pre-compressed data files (which
|
|
||||||
must have been compressed with LZO1X-999).
|
|
||||||
|
|
||||||
miniLZO consists of one C source file and three header files:
|
|
||||||
minilzo.c
|
|
||||||
minilzo.h, lzoconf.h, lzodefs.h
|
|
||||||
|
|
||||||
To use miniLZO just copy these files into your source directory, add
|
|
||||||
minilzo.c to your Makefile and #include minilzo.h from your program.
|
|
||||||
Note: you also must distribute this file (`README.LZO') with your project.
|
|
||||||
|
|
||||||
minilzo.o compiles to about 6 kB (using gcc or Visual C on a i386), and
|
|
||||||
the sources are about 30 kB when packed with zip - so there's no more
|
|
||||||
excuse that your application doesn't support data compression :-)
|
|
||||||
|
|
||||||
For more information, documentation, example programs and other support
|
|
||||||
files (like Makefiles and build scripts) please download the full LZO
|
|
||||||
package from
|
|
||||||
http://www.oberhumer.com/opensource/lzo/
|
|
||||||
|
|
||||||
Have fun,
|
|
||||||
Markus
|
|
||||||
|
|
||||||
|
|
||||||
P.S. minilzo.c is generated automatically from the LZO sources and
|
|
||||||
therefore functionality is completely identical
|
|
||||||
|
|
||||||
|
|
||||||
Appendix A: building miniLZO
|
|
||||||
----------------------------
|
|
||||||
miniLZO is written such a way that it should compile and run
|
|
||||||
out-of-the-box on most machines.
|
|
||||||
|
|
||||||
If you are running on a very unusual architecture and lzo_init() fails then
|
|
||||||
you should first recompile with `-DLZO_DEBUG' to see what causes the failure.
|
|
||||||
The most probable case is something like `sizeof(char *) != sizeof(long)'.
|
|
||||||
After identifying the problem you can compile by adding some defines
|
|
||||||
like `-DSIZEOF_CHAR_P=8' to your Makefile.
|
|
||||||
|
|
||||||
The best solution is (of course) using Autoconf - if your project uses
|
|
||||||
Autoconf anyway just add `-DMINILZO_HAVE_CONFIG_H' to your compiler
|
|
||||||
flags when compiling minilzo.c. See the LZO distribution for an example
|
|
||||||
how to set up configure.in.
|
|
||||||
|
|
||||||
|
|
||||||
Appendix B: list of public functions available in miniLZO
|
|
||||||
---------------------------------------------------------
|
|
||||||
Library initialization
|
|
||||||
lzo_init()
|
|
||||||
|
|
||||||
Compression
|
|
||||||
lzo1x_1_compress()
|
|
||||||
|
|
||||||
Decompression
|
|
||||||
lzo1x_decompress()
|
|
||||||
lzo1x_decompress_safe()
|
|
||||||
|
|
||||||
Checksum functions
|
|
||||||
lzo_adler32()
|
|
||||||
|
|
||||||
Version functions
|
|
||||||
lzo_version()
|
|
||||||
lzo_version_string()
|
|
||||||
lzo_version_date()
|
|
||||||
|
|
||||||
Portable (but slow) string functions
|
|
||||||
lzo_memcmp()
|
|
||||||
lzo_memcpy()
|
|
||||||
lzo_memmove()
|
|
||||||
lzo_memset()
|
|
||||||
|
|
||||||
|
|
||||||
Appendix C: suggested macros for `configure.in' when using Autoconf
|
|
||||||
-------------------------------------------------------------------
|
|
||||||
Checks for typedefs and structures
|
|
||||||
AC_CHECK_TYPE(ptrdiff_t,long)
|
|
||||||
AC_TYPE_SIZE_T
|
|
||||||
AC_CHECK_SIZEOF(short)
|
|
||||||
AC_CHECK_SIZEOF(int)
|
|
||||||
AC_CHECK_SIZEOF(long)
|
|
||||||
AC_CHECK_SIZEOF(long long)
|
|
||||||
AC_CHECK_SIZEOF(__int64)
|
|
||||||
AC_CHECK_SIZEOF(void *)
|
|
||||||
AC_CHECK_SIZEOF(size_t)
|
|
||||||
AC_CHECK_SIZEOF(ptrdiff_t)
|
|
||||||
|
|
||||||
Checks for compiler characteristics
|
|
||||||
AC_C_CONST
|
|
||||||
|
|
||||||
Checks for library functions
|
|
||||||
AC_CHECK_FUNCS(memcmp memcpy memmove memset)
|
|
||||||
|
|
||||||
|
|
||||||
Appendix D: Copyright
|
|
||||||
---------------------
|
|
||||||
LZO and miniLZO are Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002,
|
|
||||||
2003, 2004, 2005, 2006, 2007, 2008 Markus Franz Xaver Johannes Oberhumer
|
|
||||||
|
|
||||||
LZO and miniLZO are distributed under the terms of the GNU General
|
|
||||||
Public License (GPL). See the file COPYING.
|
|
||||||
|
|
||||||
Special licenses for commercial and other applications which
|
|
||||||
are not willing to accept the GNU General Public License
|
|
||||||
are available by contacting the author.
|
|
||||||
|
|
||||||
|
|
|
@ -1,417 +0,0 @@
|
||||||
/* lzoconf.h -- configuration for the LZO real-time data compression library
|
|
||||||
|
|
||||||
This file is part of the LZO real-time data compression library.
|
|
||||||
|
|
||||||
Copyright (C) 2008 Markus Franz Xaver Johannes Oberhumer
|
|
||||||
Copyright (C) 2007 Markus Franz Xaver Johannes Oberhumer
|
|
||||||
Copyright (C) 2006 Markus Franz Xaver Johannes Oberhumer
|
|
||||||
Copyright (C) 2005 Markus Franz Xaver Johannes Oberhumer
|
|
||||||
Copyright (C) 2004 Markus Franz Xaver Johannes Oberhumer
|
|
||||||
Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer
|
|
||||||
Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer
|
|
||||||
Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer
|
|
||||||
Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer
|
|
||||||
Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer
|
|
||||||
Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer
|
|
||||||
Copyright (C) 1997 Markus Franz Xaver Johannes Oberhumer
|
|
||||||
Copyright (C) 1996 Markus Franz Xaver Johannes Oberhumer
|
|
||||||
All Rights Reserved.
|
|
||||||
|
|
||||||
The LZO library is free software; you can redistribute it and/or
|
|
||||||
modify it under the terms of the GNU General Public License as
|
|
||||||
published by the Free Software Foundation; either version 2 of
|
|
||||||
the License, or (at your option) any later version.
|
|
||||||
|
|
||||||
The LZO library is distributed in the hope that it will be useful,
|
|
||||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
GNU General Public License for more details.
|
|
||||||
|
|
||||||
You should have received a copy of the GNU General Public License
|
|
||||||
along with the LZO library; see the file COPYING.
|
|
||||||
If not, write to the Free Software Foundation, Inc.,
|
|
||||||
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
|
||||||
|
|
||||||
Markus F.X.J. Oberhumer
|
|
||||||
<markus@oberhumer.com>
|
|
||||||
http://www.oberhumer.com/opensource/lzo/
|
|
||||||
*/
|
|
||||||
|
|
||||||
|
|
||||||
#ifndef __LZOCONF_H_INCLUDED
|
|
||||||
#define __LZOCONF_H_INCLUDED
|
|
||||||
|
|
||||||
#define LZO_VERSION 0x2030
|
|
||||||
#define LZO_VERSION_STRING "2.03"
|
|
||||||
#define LZO_VERSION_DATE "Apr 30 2008"
|
|
||||||
|
|
||||||
/* internal Autoconf configuration file - only used when building LZO */
|
|
||||||
#if defined(LZO_HAVE_CONFIG_H)
|
|
||||||
# include <config.h>
|
|
||||||
#endif
|
|
||||||
#include <limits.h>
|
|
||||||
#include <stddef.h>
|
|
||||||
|
|
||||||
|
|
||||||
/***********************************************************************
|
|
||||||
// LZO requires a conforming <limits.h>
|
|
||||||
************************************************************************/
|
|
||||||
|
|
||||||
#if !defined(CHAR_BIT) || (CHAR_BIT != 8)
|
|
||||||
# error "invalid CHAR_BIT"
|
|
||||||
#endif
|
|
||||||
#if !defined(UCHAR_MAX) || !defined(UINT_MAX) || !defined(ULONG_MAX)
|
|
||||||
# error "check your compiler installation"
|
|
||||||
#endif
|
|
||||||
#if (USHRT_MAX < 1) || (UINT_MAX < 1) || (ULONG_MAX < 1)
|
|
||||||
# error "your limits.h macros are broken"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/* get OS and architecture defines */
|
|
||||||
#ifndef __LZODEFS_H_INCLUDED
|
|
||||||
#include "lzodefs.h"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
|
|
||||||
#ifdef __cplusplus
|
|
||||||
extern "C" {
|
|
||||||
#endif
|
|
||||||
|
|
||||||
|
|
||||||
/***********************************************************************
|
|
||||||
// some core defines
|
|
||||||
************************************************************************/
|
|
||||||
|
|
||||||
#if !defined(LZO_UINT32_C)
|
|
||||||
# if (UINT_MAX < LZO_0xffffffffL)
|
|
||||||
# define LZO_UINT32_C(c) c ## UL
|
|
||||||
# else
|
|
||||||
# define LZO_UINT32_C(c) ((c) + 0U)
|
|
||||||
# endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/* memory checkers */
|
|
||||||
#if !defined(__LZO_CHECKER)
|
|
||||||
# if defined(__BOUNDS_CHECKING_ON)
|
|
||||||
# define __LZO_CHECKER 1
|
|
||||||
# elif defined(__CHECKER__)
|
|
||||||
# define __LZO_CHECKER 1
|
|
||||||
# elif defined(__INSURE__)
|
|
||||||
# define __LZO_CHECKER 1
|
|
||||||
# elif defined(__PURIFY__)
|
|
||||||
# define __LZO_CHECKER 1
|
|
||||||
# endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
|
|
||||||
/***********************************************************************
|
|
||||||
// integral and pointer types
|
|
||||||
************************************************************************/
|
|
||||||
|
|
||||||
/* lzo_uint should match size_t */
|
|
||||||
#if !defined(LZO_UINT_MAX)
|
|
||||||
# if defined(LZO_ABI_LLP64) /* WIN64 */
|
|
||||||
# if defined(LZO_OS_WIN64)
|
|
||||||
typedef unsigned __int64 lzo_uint;
|
|
||||||
typedef __int64 lzo_int;
|
|
||||||
# else
|
|
||||||
typedef unsigned long long lzo_uint;
|
|
||||||
typedef long long lzo_int;
|
|
||||||
# endif
|
|
||||||
# define LZO_UINT_MAX 0xffffffffffffffffull
|
|
||||||
# define LZO_INT_MAX 9223372036854775807LL
|
|
||||||
# define LZO_INT_MIN (-1LL - LZO_INT_MAX)
|
|
||||||
# elif defined(LZO_ABI_IP32L64) /* MIPS R5900 */
|
|
||||||
typedef unsigned int lzo_uint;
|
|
||||||
typedef int lzo_int;
|
|
||||||
# define LZO_UINT_MAX UINT_MAX
|
|
||||||
# define LZO_INT_MAX INT_MAX
|
|
||||||
# define LZO_INT_MIN INT_MIN
|
|
||||||
# elif (ULONG_MAX >= LZO_0xffffffffL)
|
|
||||||
typedef unsigned long lzo_uint;
|
|
||||||
typedef long lzo_int;
|
|
||||||
# define LZO_UINT_MAX ULONG_MAX
|
|
||||||
# define LZO_INT_MAX LONG_MAX
|
|
||||||
# define LZO_INT_MIN LONG_MIN
|
|
||||||
# else
|
|
||||||
# error "lzo_uint"
|
|
||||||
# endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/* Integral types with 32 bits or more. */
|
|
||||||
#if !defined(LZO_UINT32_MAX)
|
|
||||||
# if (UINT_MAX >= LZO_0xffffffffL)
|
|
||||||
typedef unsigned int lzo_uint32;
|
|
||||||
typedef int lzo_int32;
|
|
||||||
# define LZO_UINT32_MAX UINT_MAX
|
|
||||||
# define LZO_INT32_MAX INT_MAX
|
|
||||||
# define LZO_INT32_MIN INT_MIN
|
|
||||||
# elif (ULONG_MAX >= LZO_0xffffffffL)
|
|
||||||
typedef unsigned long lzo_uint32;
|
|
||||||
typedef long lzo_int32;
|
|
||||||
# define LZO_UINT32_MAX ULONG_MAX
|
|
||||||
# define LZO_INT32_MAX LONG_MAX
|
|
||||||
# define LZO_INT32_MIN LONG_MIN
|
|
||||||
# else
|
|
||||||
# error "lzo_uint32"
|
|
||||||
# endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/* The larger type of lzo_uint and lzo_uint32. */
|
|
||||||
#if (LZO_UINT_MAX >= LZO_UINT32_MAX)
|
|
||||||
# define lzo_xint lzo_uint
|
|
||||||
#else
|
|
||||||
# define lzo_xint lzo_uint32
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/* Memory model that allows to access memory at offsets of lzo_uint. */
|
|
||||||
#if !defined(__LZO_MMODEL)
|
|
||||||
# if (LZO_UINT_MAX <= UINT_MAX)
|
|
||||||
# define __LZO_MMODEL
|
|
||||||
# elif defined(LZO_HAVE_MM_HUGE_PTR)
|
|
||||||
# define __LZO_MMODEL_HUGE 1
|
|
||||||
# define __LZO_MMODEL __huge
|
|
||||||
# else
|
|
||||||
# define __LZO_MMODEL
|
|
||||||
# endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/* no typedef here because of const-pointer issues */
|
|
||||||
#define lzo_bytep unsigned char __LZO_MMODEL *
|
|
||||||
#define lzo_charp char __LZO_MMODEL *
|
|
||||||
#define lzo_voidp void __LZO_MMODEL *
|
|
||||||
#define lzo_shortp short __LZO_MMODEL *
|
|
||||||
#define lzo_ushortp unsigned short __LZO_MMODEL *
|
|
||||||
#define lzo_uint32p lzo_uint32 __LZO_MMODEL *
|
|
||||||
#define lzo_int32p lzo_int32 __LZO_MMODEL *
|
|
||||||
#define lzo_uintp lzo_uint __LZO_MMODEL *
|
|
||||||
#define lzo_intp lzo_int __LZO_MMODEL *
|
|
||||||
#define lzo_xintp lzo_xint __LZO_MMODEL *
|
|
||||||
#define lzo_voidpp lzo_voidp __LZO_MMODEL *
|
|
||||||
#define lzo_bytepp lzo_bytep __LZO_MMODEL *
|
|
||||||
/* deprecated - use `lzo_bytep' instead of `lzo_byte *' */
|
|
||||||
#define lzo_byte unsigned char __LZO_MMODEL
|
|
||||||
|
|
||||||
typedef int lzo_bool;
|
|
||||||
|
|
||||||
|
|
||||||
/***********************************************************************
|
|
||||||
// function types
|
|
||||||
************************************************************************/
|
|
||||||
|
|
||||||
/* name mangling */
|
|
||||||
#if !defined(__LZO_EXTERN_C)
|
|
||||||
# ifdef __cplusplus
|
|
||||||
# define __LZO_EXTERN_C extern "C"
|
|
||||||
# else
|
|
||||||
# define __LZO_EXTERN_C extern
|
|
||||||
# endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/* calling convention */
|
|
||||||
#if !defined(__LZO_CDECL)
|
|
||||||
# define __LZO_CDECL __lzo_cdecl
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/* DLL export information */
|
|
||||||
#if !defined(__LZO_EXPORT1)
|
|
||||||
# define __LZO_EXPORT1
|
|
||||||
#endif
|
|
||||||
#if !defined(__LZO_EXPORT2)
|
|
||||||
# define __LZO_EXPORT2
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/* __cdecl calling convention for public C and assembly functions */
|
|
||||||
#if !defined(LZO_PUBLIC)
|
|
||||||
# define LZO_PUBLIC(_rettype) __LZO_EXPORT1 _rettype __LZO_EXPORT2 __LZO_CDECL
|
|
||||||
#endif
|
|
||||||
#if !defined(LZO_EXTERN)
|
|
||||||
# define LZO_EXTERN(_rettype) __LZO_EXTERN_C LZO_PUBLIC(_rettype)
|
|
||||||
#endif
|
|
||||||
#if !defined(LZO_PRIVATE)
|
|
||||||
# define LZO_PRIVATE(_rettype) static _rettype __LZO_CDECL
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/* function types */
|
|
||||||
typedef int
|
|
||||||
(__LZO_CDECL *lzo_compress_t) ( const lzo_bytep src, lzo_uint src_len,
|
|
||||||
lzo_bytep dst, lzo_uintp dst_len,
|
|
||||||
lzo_voidp wrkmem );
|
|
||||||
|
|
||||||
typedef int
|
|
||||||
(__LZO_CDECL *lzo_decompress_t) ( const lzo_bytep src, lzo_uint src_len,
|
|
||||||
lzo_bytep dst, lzo_uintp dst_len,
|
|
||||||
lzo_voidp wrkmem );
|
|
||||||
|
|
||||||
typedef int
|
|
||||||
(__LZO_CDECL *lzo_optimize_t) ( lzo_bytep src, lzo_uint src_len,
|
|
||||||
lzo_bytep dst, lzo_uintp dst_len,
|
|
||||||
lzo_voidp wrkmem );
|
|
||||||
|
|
||||||
typedef int
|
|
||||||
(__LZO_CDECL *lzo_compress_dict_t)(const lzo_bytep src, lzo_uint src_len,
|
|
||||||
lzo_bytep dst, lzo_uintp dst_len,
|
|
||||||
lzo_voidp wrkmem,
|
|
||||||
const lzo_bytep dict, lzo_uint dict_len );
|
|
||||||
|
|
||||||
typedef int
|
|
||||||
(__LZO_CDECL *lzo_decompress_dict_t)(const lzo_bytep src, lzo_uint src_len,
|
|
||||||
lzo_bytep dst, lzo_uintp dst_len,
|
|
||||||
lzo_voidp wrkmem,
|
|
||||||
const lzo_bytep dict, lzo_uint dict_len );
|
|
||||||
|
|
||||||
|
|
||||||
/* Callback interface. Currently only the progress indicator ("nprogress")
|
|
||||||
* is used, but this may change in a future release. */
|
|
||||||
|
|
||||||
struct lzo_callback_t;
|
|
||||||
typedef struct lzo_callback_t lzo_callback_t;
|
|
||||||
#define lzo_callback_p lzo_callback_t __LZO_MMODEL *
|
|
||||||
|
|
||||||
/* malloc & free function types */
|
|
||||||
typedef lzo_voidp (__LZO_CDECL *lzo_alloc_func_t)
|
|
||||||
(lzo_callback_p self, lzo_uint items, lzo_uint size);
|
|
||||||
typedef void (__LZO_CDECL *lzo_free_func_t)
|
|
||||||
(lzo_callback_p self, lzo_voidp ptr);
|
|
||||||
|
|
||||||
/* a progress indicator callback function */
|
|
||||||
typedef void (__LZO_CDECL *lzo_progress_func_t)
|
|
||||||
(lzo_callback_p, lzo_uint, lzo_uint, int);
|
|
||||||
|
|
||||||
struct lzo_callback_t
|
|
||||||
{
|
|
||||||
/* custom allocators (set to 0 to disable) */
|
|
||||||
lzo_alloc_func_t nalloc; /* [not used right now] */
|
|
||||||
lzo_free_func_t nfree; /* [not used right now] */
|
|
||||||
|
|
||||||
/* a progress indicator callback function (set to 0 to disable) */
|
|
||||||
lzo_progress_func_t nprogress;
|
|
||||||
|
|
||||||
/* NOTE: the first parameter "self" of the nalloc/nfree/nprogress
|
|
||||||
* callbacks points back to this struct, so you are free to store
|
|
||||||
* some extra info in the following variables. */
|
|
||||||
lzo_voidp user1;
|
|
||||||
lzo_xint user2;
|
|
||||||
lzo_xint user3;
|
|
||||||
};
|
|
||||||
|
|
||||||
|
|
||||||
/***********************************************************************
|
|
||||||
// error codes and prototypes
|
|
||||||
************************************************************************/
|
|
||||||
|
|
||||||
/* Error codes for the compression/decompression functions. Negative
|
|
||||||
* values are errors, positive values will be used for special but
|
|
||||||
* normal events.
|
|
||||||
*/
|
|
||||||
#define LZO_E_OK 0
|
|
||||||
#define LZO_E_ERROR (-1)
|
|
||||||
#define LZO_E_OUT_OF_MEMORY (-2) /* [not used right now] */
|
|
||||||
#define LZO_E_NOT_COMPRESSIBLE (-3) /* [not used right now] */
|
|
||||||
#define LZO_E_INPUT_OVERRUN (-4)
|
|
||||||
#define LZO_E_OUTPUT_OVERRUN (-5)
|
|
||||||
#define LZO_E_LOOKBEHIND_OVERRUN (-6)
|
|
||||||
#define LZO_E_EOF_NOT_FOUND (-7)
|
|
||||||
#define LZO_E_INPUT_NOT_CONSUMED (-8)
|
|
||||||
#define LZO_E_NOT_YET_IMPLEMENTED (-9) /* [not used right now] */
|
|
||||||
|
|
||||||
|
|
||||||
#ifndef lzo_sizeof_dict_t
|
|
||||||
# define lzo_sizeof_dict_t ((unsigned)sizeof(lzo_bytep))
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/* lzo_init() should be the first function you call.
|
|
||||||
* Check the return code !
|
|
||||||
*
|
|
||||||
* lzo_init() is a macro to allow checking that the library and the
|
|
||||||
* compiler's view of various types are consistent.
|
|
||||||
*/
|
|
||||||
#define lzo_init() __lzo_init_v2(LZO_VERSION,(int)sizeof(short),(int)sizeof(int),\
|
|
||||||
(int)sizeof(long),(int)sizeof(lzo_uint32),(int)sizeof(lzo_uint),\
|
|
||||||
(int)lzo_sizeof_dict_t,(int)sizeof(char *),(int)sizeof(lzo_voidp),\
|
|
||||||
(int)sizeof(lzo_callback_t))
|
|
||||||
LZO_EXTERN(int) __lzo_init_v2(unsigned,int,int,int,int,int,int,int,int,int);
|
|
||||||
|
|
||||||
/* version functions (useful for shared libraries) */
|
|
||||||
LZO_EXTERN(unsigned) lzo_version(void);
|
|
||||||
LZO_EXTERN(const char *) lzo_version_string(void);
|
|
||||||
LZO_EXTERN(const char *) lzo_version_date(void);
|
|
||||||
LZO_EXTERN(const lzo_charp) _lzo_version_string(void);
|
|
||||||
LZO_EXTERN(const lzo_charp) _lzo_version_date(void);
|
|
||||||
|
|
||||||
/* string functions */
|
|
||||||
LZO_EXTERN(int)
|
|
||||||
lzo_memcmp(const lzo_voidp _s1, const lzo_voidp _s2, lzo_uint _len);
|
|
||||||
LZO_EXTERN(lzo_voidp)
|
|
||||||
lzo_memcpy(lzo_voidp _dest, const lzo_voidp _src, lzo_uint _len);
|
|
||||||
LZO_EXTERN(lzo_voidp)
|
|
||||||
lzo_memmove(lzo_voidp _dest, const lzo_voidp _src, lzo_uint _len);
|
|
||||||
LZO_EXTERN(lzo_voidp)
|
|
||||||
lzo_memset(lzo_voidp _s, int _c, lzo_uint _len);
|
|
||||||
|
|
||||||
/* checksum functions */
|
|
||||||
LZO_EXTERN(lzo_uint32)
|
|
||||||
lzo_adler32(lzo_uint32 _adler, const lzo_bytep _buf, lzo_uint _len);
|
|
||||||
LZO_EXTERN(lzo_uint32)
|
|
||||||
lzo_crc32(lzo_uint32 _c, const lzo_bytep _buf, lzo_uint _len);
|
|
||||||
LZO_EXTERN(const lzo_uint32p)
|
|
||||||
lzo_get_crc32_table(void);
|
|
||||||
|
|
||||||
/* misc. */
|
|
||||||
LZO_EXTERN(int) _lzo_config_check(void);
|
|
||||||
typedef union { lzo_bytep p; lzo_uint u; } __lzo_pu_u;
|
|
||||||
typedef union { lzo_bytep p; lzo_uint32 u32; } __lzo_pu32_u;
|
|
||||||
typedef union { void *vp; lzo_bytep bp; lzo_uint32 u32; long l; } lzo_align_t;
|
|
||||||
|
|
||||||
/* align a char pointer on a boundary that is a multiple of `size' */
|
|
||||||
LZO_EXTERN(unsigned) __lzo_align_gap(const lzo_voidp _ptr, lzo_uint _size);
|
|
||||||
#define LZO_PTR_ALIGN_UP(_ptr,_size) \
|
|
||||||
((_ptr) + (lzo_uint) __lzo_align_gap((const lzo_voidp)(_ptr),(lzo_uint)(_size)))
|
|
||||||
|
|
||||||
|
|
||||||
/***********************************************************************
|
|
||||||
// deprecated macros - only for backward compatibility with LZO v1.xx
|
|
||||||
************************************************************************/
|
|
||||||
|
|
||||||
#if defined(LZO_CFG_COMPAT)
|
|
||||||
|
|
||||||
#define __LZOCONF_H 1
|
|
||||||
|
|
||||||
#if defined(LZO_ARCH_I086)
|
|
||||||
# define __LZO_i386 1
|
|
||||||
#elif defined(LZO_ARCH_I386)
|
|
||||||
# define __LZO_i386 1
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if defined(LZO_OS_DOS16)
|
|
||||||
# define __LZO_DOS 1
|
|
||||||
# define __LZO_DOS16 1
|
|
||||||
#elif defined(LZO_OS_DOS32)
|
|
||||||
# define __LZO_DOS 1
|
|
||||||
#elif defined(LZO_OS_WIN16)
|
|
||||||
# define __LZO_WIN 1
|
|
||||||
# define __LZO_WIN16 1
|
|
||||||
#elif defined(LZO_OS_WIN32)
|
|
||||||
# define __LZO_WIN 1
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#define __LZO_CMODEL
|
|
||||||
#define __LZO_DMODEL
|
|
||||||
#define __LZO_ENTRY __LZO_CDECL
|
|
||||||
#define LZO_EXTERN_CDECL LZO_EXTERN
|
|
||||||
#define LZO_ALIGN LZO_PTR_ALIGN_UP
|
|
||||||
|
|
||||||
#define lzo_compress_asm_t lzo_compress_t
|
|
||||||
#define lzo_decompress_asm_t lzo_decompress_t
|
|
||||||
|
|
||||||
#endif /* LZO_CFG_COMPAT */
|
|
||||||
|
|
||||||
|
|
||||||
#ifdef __cplusplus
|
|
||||||
} /* extern "C" */
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#endif /* already included */
|
|
||||||
|
|
||||||
|
|
||||||
/* vim:set ts=4 et: */
|
|
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
|
@ -1,106 +0,0 @@
|
||||||
/* minilzo.h -- mini subset of the LZO real-time data compression library
|
|
||||||
|
|
||||||
This file is part of the LZO real-time data compression library.
|
|
||||||
|
|
||||||
Copyright (C) 2008 Markus Franz Xaver Johannes Oberhumer
|
|
||||||
Copyright (C) 2007 Markus Franz Xaver Johannes Oberhumer
|
|
||||||
Copyright (C) 2006 Markus Franz Xaver Johannes Oberhumer
|
|
||||||
Copyright (C) 2005 Markus Franz Xaver Johannes Oberhumer
|
|
||||||
Copyright (C) 2004 Markus Franz Xaver Johannes Oberhumer
|
|
||||||
Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer
|
|
||||||
Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer
|
|
||||||
Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer
|
|
||||||
Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer
|
|
||||||
Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer
|
|
||||||
Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer
|
|
||||||
Copyright (C) 1997 Markus Franz Xaver Johannes Oberhumer
|
|
||||||
Copyright (C) 1996 Markus Franz Xaver Johannes Oberhumer
|
|
||||||
All Rights Reserved.
|
|
||||||
|
|
||||||
The LZO library is free software; you can redistribute it and/or
|
|
||||||
modify it under the terms of the GNU General Public License as
|
|
||||||
published by the Free Software Foundation; either version 2 of
|
|
||||||
the License, or (at your option) any later version.
|
|
||||||
|
|
||||||
The LZO library is distributed in the hope that it will be useful,
|
|
||||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
GNU General Public License for more details.
|
|
||||||
|
|
||||||
You should have received a copy of the GNU General Public License
|
|
||||||
along with the LZO library; see the file COPYING.
|
|
||||||
If not, write to the Free Software Foundation, Inc.,
|
|
||||||
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
|
||||||
|
|
||||||
Markus F.X.J. Oberhumer
|
|
||||||
<markus@oberhumer.com>
|
|
||||||
http://www.oberhumer.com/opensource/lzo/
|
|
||||||
*/
|
|
||||||
|
|
||||||
/*
|
|
||||||
* NOTE:
|
|
||||||
* the full LZO package can be found at
|
|
||||||
* http://www.oberhumer.com/opensource/lzo/
|
|
||||||
*/
|
|
||||||
|
|
||||||
|
|
||||||
#ifndef __MINILZO_H
|
|
||||||
#define __MINILZO_H
|
|
||||||
|
|
||||||
#define MINILZO_VERSION 0x2030
|
|
||||||
|
|
||||||
#ifdef __LZOCONF_H
|
|
||||||
# error "you cannot use both LZO and miniLZO"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#undef LZO_HAVE_CONFIG_H
|
|
||||||
#include "lzoconf.h"
|
|
||||||
|
|
||||||
#if !defined(LZO_VERSION) || (LZO_VERSION != MINILZO_VERSION)
|
|
||||||
# error "version mismatch in header files"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
|
|
||||||
#ifdef __cplusplus
|
|
||||||
extern "C" {
|
|
||||||
#endif
|
|
||||||
|
|
||||||
|
|
||||||
/***********************************************************************
|
|
||||||
//
|
|
||||||
************************************************************************/
|
|
||||||
|
|
||||||
/* Memory required for the wrkmem parameter.
|
|
||||||
* When the required size is 0, you can also pass a NULL pointer.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#define LZO1X_MEM_COMPRESS LZO1X_1_MEM_COMPRESS
|
|
||||||
#define LZO1X_1_MEM_COMPRESS ((lzo_uint32) (16384L * lzo_sizeof_dict_t))
|
|
||||||
#define LZO1X_MEM_DECOMPRESS (0)
|
|
||||||
|
|
||||||
|
|
||||||
/* compression */
|
|
||||||
LZO_EXTERN(int)
|
|
||||||
lzo1x_1_compress ( const lzo_bytep src, lzo_uint src_len,
|
|
||||||
lzo_bytep dst, lzo_uintp dst_len,
|
|
||||||
lzo_voidp wrkmem );
|
|
||||||
|
|
||||||
/* decompression */
|
|
||||||
LZO_EXTERN(int)
|
|
||||||
lzo1x_decompress ( const lzo_bytep src, lzo_uint src_len,
|
|
||||||
lzo_bytep dst, lzo_uintp dst_len,
|
|
||||||
lzo_voidp wrkmem /* NOT USED */ );
|
|
||||||
|
|
||||||
/* safe decompression with overrun testing */
|
|
||||||
LZO_EXTERN(int)
|
|
||||||
lzo1x_decompress_safe ( const lzo_bytep src, lzo_uint src_len,
|
|
||||||
lzo_bytep dst, lzo_uintp dst_len,
|
|
||||||
lzo_voidp wrkmem /* NOT USED */ );
|
|
||||||
|
|
||||||
|
|
||||||
#ifdef __cplusplus
|
|
||||||
} /* extern "C" */
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#endif /* already included */
|
|
||||||
|
|
|
@ -1,168 +0,0 @@
|
||||||
/* testmini.c -- very simple test program for the miniLZO library
|
|
||||||
|
|
||||||
This file is part of the LZO real-time data compression library.
|
|
||||||
|
|
||||||
Copyright (C) 2008 Markus Franz Xaver Johannes Oberhumer
|
|
||||||
Copyright (C) 2007 Markus Franz Xaver Johannes Oberhumer
|
|
||||||
Copyright (C) 2006 Markus Franz Xaver Johannes Oberhumer
|
|
||||||
Copyright (C) 2005 Markus Franz Xaver Johannes Oberhumer
|
|
||||||
Copyright (C) 2004 Markus Franz Xaver Johannes Oberhumer
|
|
||||||
Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer
|
|
||||||
Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer
|
|
||||||
Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer
|
|
||||||
Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer
|
|
||||||
Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer
|
|
||||||
Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer
|
|
||||||
Copyright (C) 1997 Markus Franz Xaver Johannes Oberhumer
|
|
||||||
Copyright (C) 1996 Markus Franz Xaver Johannes Oberhumer
|
|
||||||
All Rights Reserved.
|
|
||||||
|
|
||||||
The LZO library is free software; you can redistribute it and/or
|
|
||||||
modify it under the terms of the GNU General Public License as
|
|
||||||
published by the Free Software Foundation; either version 2 of
|
|
||||||
the License, or (at your option) any later version.
|
|
||||||
|
|
||||||
The LZO library is distributed in the hope that it will be useful,
|
|
||||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
GNU General Public License for more details.
|
|
||||||
|
|
||||||
You should have received a copy of the GNU General Public License
|
|
||||||
along with the LZO library; see the file COPYING.
|
|
||||||
If not, write to the Free Software Foundation, Inc.,
|
|
||||||
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
|
||||||
|
|
||||||
Markus F.X.J. Oberhumer
|
|
||||||
<markus@oberhumer.com>
|
|
||||||
http://www.oberhumer.com/opensource/lzo/
|
|
||||||
*/
|
|
||||||
|
|
||||||
|
|
||||||
#include <stdio.h>
|
|
||||||
#include <stdlib.h>
|
|
||||||
|
|
||||||
|
|
||||||
/*************************************************************************
|
|
||||||
// This program shows the basic usage of the LZO library.
|
|
||||||
// We will compress a block of data and decompress again.
|
|
||||||
//
|
|
||||||
// For more information, documentation, example programs and other support
|
|
||||||
// files (like Makefiles and build scripts) please download the full LZO
|
|
||||||
// package from
|
|
||||||
// http://www.oberhumer.com/opensource/lzo/
|
|
||||||
**************************************************************************/
|
|
||||||
|
|
||||||
/* First let's include "minizo.h". */
|
|
||||||
|
|
||||||
#include "minilzo.h"
|
|
||||||
|
|
||||||
|
|
||||||
/* We want to compress the data block at `in' with length `IN_LEN' to
|
|
||||||
* the block at `out'. Because the input block may be incompressible,
|
|
||||||
* we must provide a little more output space in case that compression
|
|
||||||
* is not possible.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#if defined(__LZO_STRICT_16BIT)
|
|
||||||
#define IN_LEN (8*1024u)
|
|
||||||
#elif defined(LZO_ARCH_I086) && !defined(LZO_HAVE_MM_HUGE_ARRAY)
|
|
||||||
#define IN_LEN (60*1024u)
|
|
||||||
#else
|
|
||||||
#define IN_LEN (128*1024ul)
|
|
||||||
#endif
|
|
||||||
#define OUT_LEN (IN_LEN + IN_LEN / 16 + 64 + 3)
|
|
||||||
|
|
||||||
static unsigned char __LZO_MMODEL in [ IN_LEN ];
|
|
||||||
static unsigned char __LZO_MMODEL out [ OUT_LEN ];
|
|
||||||
|
|
||||||
|
|
||||||
/* Work-memory needed for compression. Allocate memory in units
|
|
||||||
* of `lzo_align_t' (instead of `char') to make sure it is properly aligned.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#define HEAP_ALLOC(var,size) \
|
|
||||||
lzo_align_t __LZO_MMODEL var [ ((size) + (sizeof(lzo_align_t) - 1)) / sizeof(lzo_align_t) ]
|
|
||||||
|
|
||||||
static HEAP_ALLOC(wrkmem,LZO1X_1_MEM_COMPRESS);
|
|
||||||
|
|
||||||
|
|
||||||
/*************************************************************************
|
|
||||||
//
|
|
||||||
**************************************************************************/
|
|
||||||
|
|
||||||
int main(int argc, char *argv[])
|
|
||||||
{
|
|
||||||
int r;
|
|
||||||
lzo_uint in_len;
|
|
||||||
lzo_uint out_len;
|
|
||||||
lzo_uint new_len;
|
|
||||||
|
|
||||||
if (argc < 0 && argv == NULL) /* avoid warning about unused args */
|
|
||||||
return 0;
|
|
||||||
|
|
||||||
printf("\nLZO real-time data compression library (v%s, %s).\n",
|
|
||||||
lzo_version_string(), lzo_version_date());
|
|
||||||
printf("Copyright (C) 1996-2008 Markus Franz Xaver Johannes Oberhumer\nAll Rights Reserved.\n\n");
|
|
||||||
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Step 1: initialize the LZO library
|
|
||||||
*/
|
|
||||||
if (lzo_init() != LZO_E_OK)
|
|
||||||
{
|
|
||||||
printf("internal error - lzo_init() failed !!!\n");
|
|
||||||
printf("(this usually indicates a compiler bug - try recompiling\nwithout optimizations, and enable `-DLZO_DEBUG' for diagnostics)\n");
|
|
||||||
return 3;
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Step 2: prepare the input block that will get compressed.
|
|
||||||
* We just fill it with zeros in this example program,
|
|
||||||
* but you would use your real-world data here.
|
|
||||||
*/
|
|
||||||
in_len = IN_LEN;
|
|
||||||
lzo_memset(in,0,in_len);
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Step 3: compress from `in' to `out' with LZO1X-1
|
|
||||||
*/
|
|
||||||
r = lzo1x_1_compress(in,in_len,out,&out_len,wrkmem);
|
|
||||||
if (r == LZO_E_OK)
|
|
||||||
printf("compressed %lu bytes into %lu bytes\n",
|
|
||||||
(unsigned long) in_len, (unsigned long) out_len);
|
|
||||||
else
|
|
||||||
{
|
|
||||||
/* this should NEVER happen */
|
|
||||||
printf("internal error - compression failed: %d\n", r);
|
|
||||||
return 2;
|
|
||||||
}
|
|
||||||
/* check for an incompressible block */
|
|
||||||
if (out_len >= in_len)
|
|
||||||
{
|
|
||||||
printf("This block contains incompressible data.\n");
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Step 4: decompress again, now going from `out' to `in'
|
|
||||||
*/
|
|
||||||
new_len = in_len;
|
|
||||||
r = lzo1x_decompress(out,out_len,in,&new_len,NULL);
|
|
||||||
if (r == LZO_E_OK && new_len == in_len)
|
|
||||||
printf("decompressed %lu bytes back into %lu bytes\n",
|
|
||||||
(unsigned long) out_len, (unsigned long) in_len);
|
|
||||||
else
|
|
||||||
{
|
|
||||||
/* this should NEVER happen */
|
|
||||||
printf("internal error - decompression failed: %d\n", r);
|
|
||||||
return 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
printf("\nminiLZO simple compression test passed.\n");
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
|
||||||
vi:ts=4:et
|
|
||||||
*/
|
|
||||||
|
|
|
@ -134,6 +134,9 @@ char *CrashLog::LogConfiguration(char *buffer, const char *last) const
|
||||||
#ifdef WITH_ICU
|
#ifdef WITH_ICU
|
||||||
# include <unicode/uversion.h>
|
# include <unicode/uversion.h>
|
||||||
#endif /* WITH_ICU */
|
#endif /* WITH_ICU */
|
||||||
|
#ifdef WITH_LZO
|
||||||
|
#include <lzo/lzo1x.h>
|
||||||
|
#endif
|
||||||
#ifdef WITH_SDL
|
#ifdef WITH_SDL
|
||||||
# include "sdl.h"
|
# include "sdl.h"
|
||||||
# include <SDL.h>
|
# include <SDL.h>
|
||||||
|
@ -173,6 +176,10 @@ char *CrashLog::LogLibraries(char *buffer, const char *last) const
|
||||||
buffer += seprintf(buffer, last, " ICU: %s\n", buf);
|
buffer += seprintf(buffer, last, " ICU: %s\n", buf);
|
||||||
#endif /* WITH_ICU */
|
#endif /* WITH_ICU */
|
||||||
|
|
||||||
|
#ifdef WITH_LZO
|
||||||
|
buffer += seprintf(buffer, last, " LZO: %s\n", lzo_version_string());
|
||||||
|
#endif
|
||||||
|
|
||||||
#ifdef WITH_PNG
|
#ifdef WITH_PNG
|
||||||
buffer += seprintf(buffer, last, " PNG: %s\n", png_get_libpng_ver(NULL));
|
buffer += seprintf(buffer, last, " PNG: %s\n", png_get_libpng_ver(NULL));
|
||||||
#endif /* WITH_PNG */
|
#endif /* WITH_PNG */
|
||||||
|
|
|
@ -388,7 +388,6 @@ static const char * const _credits[] = {
|
||||||
" Richard Kempton (richK) - additional airports, initial TGP implementation",
|
" Richard Kempton (richK) - additional airports, initial TGP implementation",
|
||||||
"",
|
"",
|
||||||
" Alberto Demichelis - Squirrel scripting language \xC2\xA9 2003-2008",
|
" Alberto Demichelis - Squirrel scripting language \xC2\xA9 2003-2008",
|
||||||
" Markus F.X.J. Oberhumer - (Mini)LZO for loading old savegames \xC2\xA9 1996-2008",
|
|
||||||
" L. Peter Deutsch - MD5 implementation \xC2\xA9 1999, 2000, 2002",
|
" L. Peter Deutsch - MD5 implementation \xC2\xA9 1999, 2000, 2002",
|
||||||
" Michael Blunck - Pre-Signals and Semaphores \xC2\xA9 2003",
|
" Michael Blunck - Pre-Signals and Semaphores \xC2\xA9 2003",
|
||||||
" George - Canal/Lock graphics \xC2\xA9 2003-2004",
|
" George - Canal/Lock graphics \xC2\xA9 2003-2004",
|
||||||
|
|
|
@ -1244,9 +1244,11 @@ static void SlFixPointers()
|
||||||
/*******************************************
|
/*******************************************
|
||||||
********** START OF LZO CODE **************
|
********** START OF LZO CODE **************
|
||||||
*******************************************/
|
*******************************************/
|
||||||
|
|
||||||
|
#ifdef WITH_LZO
|
||||||
#define LZO_SIZE 8192
|
#define LZO_SIZE 8192
|
||||||
|
|
||||||
#include "../3rdparty/minilzo/minilzo.h"
|
#include <lzo/lzo1x.h>
|
||||||
|
|
||||||
static size_t ReadLZO()
|
static size_t ReadLZO()
|
||||||
{
|
{
|
||||||
|
@ -1305,6 +1307,8 @@ static void UninitLZO()
|
||||||
free(_sl.buf_ori);
|
free(_sl.buf_ori);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#endif /* WITH_LZO */
|
||||||
|
|
||||||
/*********************************************
|
/*********************************************
|
||||||
******** START OF NOCOMP CODE (uncompressed)*
|
******** START OF NOCOMP CODE (uncompressed)*
|
||||||
*********************************************/
|
*********************************************/
|
||||||
|
@ -1596,7 +1600,11 @@ struct SaveLoadFormat {
|
||||||
|
|
||||||
static const SaveLoadFormat _saveload_formats[] = {
|
static const SaveLoadFormat _saveload_formats[] = {
|
||||||
{"memory", 0, NULL, NULL, NULL, InitMem, WriteMem, UnInitMem},
|
{"memory", 0, NULL, NULL, NULL, InitMem, WriteMem, UnInitMem},
|
||||||
|
#if defined(WITH_LZO)
|
||||||
{"lzo", TO_BE32X('OTTD'), InitLZO, ReadLZO, UninitLZO, InitLZO, WriteLZO, UninitLZO},
|
{"lzo", TO_BE32X('OTTD'), InitLZO, ReadLZO, UninitLZO, InitLZO, WriteLZO, UninitLZO},
|
||||||
|
#else
|
||||||
|
{"lzo", TO_BE32X('OTTD'), NULL, NULL, NULL, NULL, NULL, NULL},
|
||||||
|
#endif
|
||||||
{"none", TO_BE32X('OTTN'), InitNoComp, ReadNoComp, UninitNoComp, InitNoComp, WriteNoComp, UninitNoComp},
|
{"none", TO_BE32X('OTTN'), InitNoComp, ReadNoComp, UninitNoComp, InitNoComp, WriteNoComp, UninitNoComp},
|
||||||
#if defined(WITH_ZLIB)
|
#if defined(WITH_ZLIB)
|
||||||
{"zlib", TO_BE32X('OTTZ'), InitReadZlib, ReadZlib, UninitReadZlib, InitWriteZlib, WriteZlib, UninitWriteZlib},
|
{"zlib", TO_BE32X('OTTZ'), InitReadZlib, ReadZlib, UninitReadZlib, InitWriteZlib, WriteZlib, UninitWriteZlib},
|
||||||
|
|
Loading…
Reference in New Issue