dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Codechange: liblzma is called liblzma, how ever strange that might be

Browse Source 
It is the only library we use that calls itself with 'lib' in the
name. This might be confusing, but with the arrival of cmake a lot
of these things are automated. And detection will find 'liblzma',
not 'lzma', like with 'lzo', 'zlib', ..
This commit is contained in:
Patric Stout
2019-03-10 16:41:01 +01:00
parent dcc5183dd0
commit 7adae09897
12 changed files with 37 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/crashlog.cpp
View File

@@ -55,7 +55,7 @@
#if defined(WITH_ICU_LAYOUT) || defined(WITH_ICU_SORT)
# include <unicode/uversion.h>
#endif /* WITH_ICU_SORT || WITH_ICU_LAYOUT */
#ifdef WITH_LZMA
#ifdef WITH_LIBLZMA
# include <lzma.h>
#endif
#ifdef WITH_LZO
@@ -254,7 +254,7 @@ char *CrashLog::LogLibraries(char *buffer, const char *last) const
#endif
#endif /* WITH_ICU_SORT || WITH_ICU_LAYOUT */
#ifdef WITH_LZMA
#ifdef WITH_LIBLZMA
buffer += seprintf(buffer, last, " LZMA: %s\n", lzma_version_string());
#endif

6
src/saveload/saveload.cpp
View File

@@ -2153,7 +2153,7 @@ struct ZlibSaveFilter : SaveFilter {
********** START OF LZMA CODE **************
********************************************/
#if defined(WITH_LZMA)
#if defined(WITH_LIBLZMA)
#include <lzma.h>
/**
@@ -2266,7 +2266,7 @@ struct LZMASaveFilter : SaveFilter {
}
};
#endif /* WITH_LZMA */
#endif /* WITH_LIBLZMA */
/*******************************************
************* END OF CODE *****************
@@ -2303,7 +2303,7 @@ static const SaveLoadFormat _saveload_formats[] = {
#else
{"zlib", TO_BE32X('OTTZ'), NULL, NULL, 0, 0, 0},
#endif
#if defined(WITH_LZMA)
#if defined(WITH_LIBLZMA)
/* Level 2 compression is speed wise as fast as zlib level 6 compression (old default), but results in ~10% smaller saves.
* Higher compression levels are possible, and might improve savegame size by up to 25%, but are also up to 10 times slower.
* The next significant reduction in file size is at level 4, but that is already 4 times slower. Level 3 is primarily 50%

10
src/textfile_gui.cpp
View File

@@ -25,7 +25,7 @@
#include <zlib.h>
#endif
#if defined(WITH_LZMA)
#if defined(WITH_LIBLZMA)
#include <lzma.h>
#endif
@@ -257,7 +257,7 @@ static void Gunzip(byte **bufp, size_t *sizep)
}
#endif
#if defined(WITH_LZMA)
#if defined(WITH_LIBLZMA)
/**
* Do an in-memory xunzip operation. This works on a .xz or (legacy)
@@ -332,7 +332,7 @@ static void Xunzip(byte **bufp, size_t *sizep)
if (read != filesize) return;
#if defined(WITH_ZLIB) || defined(WITH_LZMA)
#if defined(WITH_ZLIB) || defined(WITH_LIBLZMA)
const char *suffix = strrchr(textfile, '.');
if (suffix == NULL) return;
#endif
@@ -342,7 +342,7 @@ static void Xunzip(byte **bufp, size_t *sizep)
if (strcmp(suffix, ".gz") == 0) Gunzip((byte**)&this->text, &filesize);
#endif
#if defined(WITH_LZMA)
#if defined(WITH_LIBLZMA)
/* In-place xunzip */
if (strcmp(suffix, ".xz") == 0) Xunzip((byte**)&this->text, &filesize);
#endif
@@ -407,7 +407,7 @@ const char *GetTextfile(TextfileType type, Subdirectory dir, const char *filenam
#if defined(WITH_ZLIB)
"txt.gz",
#endif
#if defined(WITH_LZMA)
#if defined(WITH_LIBLZMA)
"txt.xz",
#endif
};