diff options
| author | rubidium <rubidium@openttd.org> | 2010-01-10 13:12:34 +0000 |
|---|---|---|
| committer | rubidium <rubidium@openttd.org> | 2010-01-10 13:12:34 +0000 |
| commit | 3ca0937c1cc5c229eb07d4e07de2979c0e024e47 (patch) | |
| tree | c540ff23c43f7f016b5802e5ba31c2fa65e4209d /src/saveload | |
| parent | 5afce5831d1c698e5f9f3d206a8b3da140087a7b (diff) | |
| download | openttd-3ca0937c1cc5c229eb07d4e07de2979c0e024e47.tar.xz | |
(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.
Diffstat (limited to 'src/saveload')
| -rw-r--r-- | src/saveload/saveload.cpp | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/saveload/saveload.cpp b/src/saveload/saveload.cpp index 2126d54a4..1633e853e 100644 --- a/src/saveload/saveload.cpp +++ b/src/saveload/saveload.cpp @@ -1244,9 +1244,11 @@ static void SlFixPointers() /******************************************* ********** START OF LZO CODE ************** *******************************************/ + +#ifdef WITH_LZO #define LZO_SIZE 8192 -#include "../3rdparty/minilzo/minilzo.h" +#include <lzo/lzo1x.h> static size_t ReadLZO() { @@ -1305,6 +1307,8 @@ static void UninitLZO() free(_sl.buf_ori); } +#endif /* WITH_LZO */ + /********************************************* ******** START OF NOCOMP CODE (uncompressed)* *********************************************/ @@ -1596,7 +1600,11 @@ struct SaveLoadFormat { static const SaveLoadFormat _saveload_formats[] = { {"memory", 0, NULL, NULL, NULL, InitMem, WriteMem, UnInitMem}, +#if defined(WITH_LZO) {"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}, #if defined(WITH_ZLIB) {"zlib", TO_BE32X('OTTZ'), InitReadZlib, ReadZlib, UninitReadZlib, InitWriteZlib, WriteZlib, UninitWriteZlib}, |