From f2988212b0424ce808e4d3c2b043144cfbaff6ff Mon Sep 17 00:00:00 2001 From: Morten Delenk Date: Tue, 15 Dec 2015 12:16:31 +0100 Subject: [PATCH 1/2] Created shared library --- include/compress.h | 51 ++++++++++++++++++++++++++++++++++++++++++++++ makefile | 17 +++++++++++++--- 2 files changed, 65 insertions(+), 3 deletions(-) create mode 100644 include/compress.h diff --git a/include/compress.h b/include/compress.h new file mode 100644 index 0000000..cbcf315 --- /dev/null +++ b/include/compress.h @@ -0,0 +1,51 @@ +/* + exhal / inhal (de)compression routines + + Copyright (c) 2013 Devin Acker + + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated documentation files (the "Software"), to deal + in the Software without restriction, including without limitation the rights + to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + copies of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included in + all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + THE SOFTWARE. + +*/ + +#ifndef _COMPRESS_H +#define _COMPRESS_H + +#ifdef __cplusplus +extern "C" { +#endif + +#include +#include +#include + +#define DATA_SIZE 65536 +#define RUN_SIZE 32 +#define LONG_RUN_SIZE 1024 + +extern size_t pack (uint8_t *unpacked, size_t inputsize, uint8_t *packed, int fast); +extern size_t unpack (uint8_t *packed, uint8_t *unpacked); + +extern size_t unpack_from_file (FILE *file, size_t offset, uint8_t *unpacked); + +#ifdef __cplusplus +} +#endif + +// end include guard +#endif diff --git a/makefile b/makefile index 20b7abb..3806ddf 100644 --- a/makefile +++ b/makefile @@ -2,7 +2,7 @@ # copyright 2013 Devin Acker (Revenant) # See copying.txt for legal information. -CFLAGS += -std=c99 -Os -Wall -s +CFLAGS += -std=c99 -Os -Wall -s -fpic # Add extension when compiling for Windows ifdef SystemRoot @@ -12,14 +12,14 @@ ifdef SystemRoot endif # Comment this line to suppress detailed decompression information on stdout -DEFINES += -DEXTRA_OUT +#DEFINES += -DEXTRA_OUT # Uncomment this line to enable debug output #DEFINES += -DDEBUG_OUT all: inhal$(EXT) exhal$(EXT) clean: - $(RM) inhal$(EXT) exhal$(EXT) compress.o + $(RM) inhal$(EXT) exhal$(EXT) compress.o libexhal.so inhal$(EXT): inhal.c compress.o $(CC) $(DEFINES) $(CFLAGS) -o inhal$(EXT) inhal.c compress.o @@ -29,3 +29,14 @@ exhal$(EXT): exhal.c compress.o compress.o: compress.c $(CC) $(DEFINES) $(CFLAGS) -c compress.c + +libexhal.so: compress.o + gcc -shared -o $@ $^ + +install: all libexhal.so + mkdir -pv /usr/local/bin + cp inhal$(EXT) exhal$(EXT) /usr/local/bin + mkdir -pv /usr/local/lib + cp libexhal.so /usr/local/lib + mkdir -pv /usr/local/include + cp include/* /usr/local/include From 60d40ac81b2d58d73f5f7e3e1da65382cd239521 Mon Sep 17 00:00:00 2001 From: Morten Delenk Date: Sat, 20 Feb 2016 10:39:33 +0100 Subject: [PATCH 2/2] Added a static library --- makefile | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/makefile b/makefile index 3806ddf..3c26b48 100644 --- a/makefile +++ b/makefile @@ -3,20 +3,22 @@ # See copying.txt for legal information. CFLAGS += -std=c99 -Os -Wall -s -fpic - # Add extension when compiling for Windows ifdef SystemRoot CC = gcc EXT = .exe + LIBEXT = .dll RM = del +else + LIBEXT = .so endif # Comment this line to suppress detailed decompression information on stdout -#DEFINES += -DEXTRA_OUT +DEFINES += -DEXTRA_OUT # Uncomment this line to enable debug output -#DEFINES += -DDEBUG_OUT +DEFINES += -DDEBUG_OUT -all: inhal$(EXT) exhal$(EXT) +all: inhal$(EXT) exhal$(EXT) libexhal$(LIBEXT) libexhal.a clean: $(RM) inhal$(EXT) exhal$(EXT) compress.o libexhal.so @@ -30,13 +32,15 @@ exhal$(EXT): exhal.c compress.o compress.o: compress.c $(CC) $(DEFINES) $(CFLAGS) -c compress.c -libexhal.so: compress.o +libexhal$(LIBEXT): compress.o gcc -shared -o $@ $^ - +libexhal.a: compress.o + ar rcs $@ $^ install: all libexhal.so mkdir -pv /usr/local/bin cp inhal$(EXT) exhal$(EXT) /usr/local/bin mkdir -pv /usr/local/lib - cp libexhal.so /usr/local/lib + cp libexhal$(LIBEXT) /usr/local/lib + cp libexhal.a /usr/local/lib mkdir -pv /usr/local/include cp include/* /usr/local/include