mirror of
https://github.com/Rockbox/rockbox.git
synced 2025-12-08 12:45:26 -05:00
Fix libmspack to compile with rbutil
The build system used by rbutil is not very robust: all the files are eventually compiled to the same directory so we cannot have two files with the same name (system.c would conflicts with system.cpp) so rename one file to avoid this. Also change all include directives to local ones because we don't have to expose the entire mspack source to inclusion. Change-Id: I3fe0638d69fdc30566eb9425abfe33c807678b28 Reviewed-on: http://gerrit.rockbox.org/417 Reviewed-by: Dominik Riebeling <Dominik.Riebeling@gmail.com>
This commit is contained in:
parent
739a7ae0e9
commit
289acf3333
26 changed files with 55 additions and 55 deletions
|
|
@ -12,8 +12,8 @@
|
|||
|
||||
/* LZX decompression implementation */
|
||||
|
||||
#include <system.h>
|
||||
#include <lzx.h>
|
||||
#include "system-mspack.h"
|
||||
#include "lzx.h"
|
||||
|
||||
/* Microsoft's LZX document (in cab-sdk.exe) and their implementation
|
||||
* of the com.ms.util.cab Java package do not concur.
|
||||
|
|
@ -85,7 +85,7 @@
|
|||
READ_IF_NEEDED; b1 = *i_ptr++; \
|
||||
INJECT_BITS((b1 << 8) | b0, 16); \
|
||||
} while (0)
|
||||
#include <readbits.h>
|
||||
#include "readbits.h"
|
||||
|
||||
/* import huffman-reading macros and code */
|
||||
#define TABLEBITS(tbl) LZX_##tbl##_TABLEBITS
|
||||
|
|
@ -93,7 +93,7 @@
|
|||
#define HUFF_TABLE(tbl,idx) lzx->tbl##_table[idx]
|
||||
#define HUFF_LEN(tbl,idx) lzx->tbl##_len[idx]
|
||||
#define HUFF_ERROR return lzx->error = MSPACK_ERR_DECRUNCH
|
||||
#include <readhuff.h>
|
||||
#include "readhuff.h"
|
||||
|
||||
/* BUILD_TABLE(tbl) builds a huffman lookup table from code lengths */
|
||||
#define BUILD_TABLE(tbl) \
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue