From bb8c8598d8a201dc1ad2ed238aa013e9030cbfae Mon Sep 17 00:00:00 2001 From: Christian Date: Mon, 24 Oct 2016 06:08:14 +0200 Subject: [PATCH] Now compiles on Linux, too --- Makefile | 12 +++++++++--- contrib/liblzma/Makefile | 4 ++-- contrib/liblzma/common/sysdefs_schnaader.h | 9 +++++++-- contrib/liblzma/rangecoder/range_common.h | 1 + 4 files changed, 19 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 9a4b9a5..d2045d7 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,9 @@ GIFLIB_OBJ = contrib/giflib/dgif_lib_gcc.o contrib/giflib/egif_lib_gcc.o cont PACKJPG_OBJ = contrib/packjpg/aricoder.o contrib/packjpg/bitops.o contrib/packjpg/packjpg.o PACKMP3_OBJ = contrib/packmp3/huffmp3.o contrib/packmp3/packmp3.o ZLIB_OBJ = contrib/zlib/adler32.o contrib/zlib/crc32.o contrib/zlib/zutil.o contrib/zlib/trees.o contrib/zlib/inftrees.o contrib/zlib/inffast.o contrib/zlib/inflate.o contrib/zlib/deflate.o -CFLAGS = -DUNIX -D_FILE_OFFSET_BITS=64 -O2 -Wall +LIBLZMA_OBJ = contrib/liblzma/alone_decoder.o contrib/liblzma/alone_encoder.o contrib/liblzma/arm.o contrib/liblzma/armthumb.o contrib/liblzma/auto_decoder.o contrib/liblzma/block_buffer_decoder.o contrib/liblzma/block_buffer_encoder.o contrib/liblzma/block_decoder.o contrib/liblzma/block_encoder.o contrib/liblzma/block_header_decoder.o contrib/liblzma/block_header_encoder.o contrib/liblzma/block_util.o contrib/liblzma/check.o contrib/liblzma/common.o contrib/liblzma/crc32_table.o contrib/liblzma/crc32_x86.o contrib/liblzma/crc64_table.o contrib/liblzma/crc64_x86.o contrib/liblzma/delta_common.o contrib/liblzma/delta_decoder.o contrib/liblzma/delta_encoder.o contrib/liblzma/easy_buffer_encoder.o contrib/liblzma/easy_decoder_memusage.o contrib/liblzma/easy_encoder.o contrib/liblzma/easy_encoder_memusage.o contrib/liblzma/easy_preset.o contrib/liblzma/fastpos_table.o contrib/liblzma/filter_buffer_decoder.o contrib/liblzma/filter_buffer_encoder.o contrib/liblzma/filter_common.o contrib/liblzma/filter_decoder.o contrib/liblzma/filter_encoder.o contrib/liblzma/filter_flags_decoder.o contrib/liblzma/filter_flags_encoder.o contrib/liblzma/hardware_cputhreads.o contrib/liblzma/hardware_physmem.o contrib/liblzma/ia64.o contrib/liblzma/index.o contrib/liblzma/index_decoder.o contrib/liblzma/index_encoder.o contrib/liblzma/index_hash.o contrib/liblzma/lzma2_decoder.o contrib/liblzma/lzma2_encoder.o contrib/liblzma/lzma_decoder.o contrib/liblzma/lzma_encoder.o contrib/liblzma/lzma_encoder_optimum_fast.o contrib/liblzma/lzma_encoder_optimum_normal.o contrib/liblzma/lzma_encoder_presets.o contrib/liblzma/lz_decoder.o contrib/liblzma/lz_encoder.o contrib/liblzma/lz_encoder_mf.o contrib/liblzma/outqueue.o contrib/liblzma/powerpc.o contrib/liblzma/price_table.o contrib/liblzma/sha256.o contrib/liblzma/simple_coder.o contrib/liblzma/simple_decoder.o contrib/liblzma/simple_encoder.o contrib/liblzma/sparc.o contrib/liblzma/stream_decoder.o contrib/liblzma/stream_buffer_encoder.o contrib/liblzma/stream_buffer_decoder.o contrib/liblzma/stream_encoder.o contrib/liblzma/stream_flags_decoder.o contrib/liblzma/stream_encoder_mt.o contrib/liblzma/stream_flags_common.o contrib/liblzma/stream_flags_encoder.o contrib/liblzma/tuklib_cpucores.o contrib/liblzma/tuklib_physmem.o contrib/liblzma/vli_decoder.o contrib/liblzma/vli_encoder.o contrib/liblzma/vli_size.o contrib/liblzma/x86.o +LIBLZMA_CPP = contrib/liblzma/compress_easy_mt.cpp +CFLAGS = -DUNIX -D_FILE_OFFSET_BITS=64 -O2 -Wall -pthread .PHONY: all all: contrib $(PROGNAME) @@ -16,6 +18,7 @@ clean: make -C contrib/packjpg clean make -C contrib/packmp3 clean make -C contrib/zlib clean + make -C contrib/liblzma clean rm -f *.o bzip2: @@ -33,7 +36,10 @@ packmp3: zlib: make -C contrib/zlib -contrib: bzip2 giflib packjpg packmp3 zlib +liblzma: + make -C contrib/liblzma + +contrib: bzip2 giflib packjpg packmp3 zlib liblzma $(PROGNAME): contrib - g++ $(CFLAGS) $(GIFLIB_OBJ) $(PACKJPG_OBJ) $(PACKMP3_OBJ) $(BZIP2_OBJ) $(ZLIB_OBJ) precomp.cpp -s -oprecomp + g++ $(CFLAGS) $(GIFLIB_OBJ) $(PACKJPG_OBJ) $(PACKMP3_OBJ) $(BZIP2_OBJ) $(ZLIB_OBJ) $(LIBLZMA_OBJ) $(LIBLZMA_CPP) precomp.cpp -s -oprecomp diff --git a/contrib/liblzma/Makefile b/contrib/liblzma/Makefile index a5d5a31..7229ac6 100644 --- a/contrib/liblzma/Makefile +++ b/contrib/liblzma/Makefile @@ -1,4 +1,4 @@ -CFLAGS = -DUNIX -D_FILE_OFFSET_BITS=64 -O2 -Wno-implicit-function-declaration +CFLAGS = -g -c -DHAVE__BOOL -DUNIX -D_FILE_OFFSET_BITS=64 -O2 -Wno-implicit-function-declaration -pthread LIBLZMA_INCLUDES = -Iapi/ -Icheck/ -Icommon/ -Idelta/ -Ilz/ -Ilzma/ -Irangecoder/ -Isimple/ LIBLZMA_C = common/tuklib_physmem.c common/tuklib_cpucores.c common/common.c common/block_util.c common/easy_preset.c common/filter_common.c common/hardware_physmem.c common/index.c common/stream_flags_common.c common/vli_size.c common/alone_encoder.c common/block_buffer_encoder.c common/block_encoder.c common/block_header_encoder.c common/easy_buffer_encoder.c common/easy_encoder.c common/easy_encoder_memusage.c common/filter_buffer_encoder.c common/filter_encoder.c common/filter_flags_encoder.c common/index_encoder.c common/stream_buffer_encoder.c common/stream_encoder.c common/stream_flags_encoder.c common/vli_encoder.c common/hardware_cputhreads.c common/outqueue.c common/stream_encoder_mt.c common/alone_decoder.c common/auto_decoder.c common/block_buffer_decoder.c common/block_decoder.c common/block_header_decoder.c common/easy_decoder_memusage.c common/filter_buffer_decoder.c common/filter_decoder.c common/filter_flags_decoder.c common/index_decoder.c common/index_hash.c common/stream_decoder.c common/stream_buffer_decoder.c common/stream_flags_decoder.c common/vli_decoder.c check/check.c check/crc32_table.c check/crc32_x86.S check/crc64_table.c check/crc64_x86.S check/sha256.c lz/lz_encoder.c lz/lz_encoder_mf.c lz/lz_decoder.c lzma/lzma_encoder.c lzma/lzma_encoder_presets.c lzma/lzma_encoder_optimum_fast.c lzma/lzma_encoder_optimum_normal.c lzma/fastpos_table.c lzma/lzma_decoder.c lzma/lzma2_encoder.c lzma/lzma2_decoder.c rangecoder/price_table.c delta/delta_common.c delta/delta_encoder.c delta/delta_decoder.c simple/simple_coder.c simple/simple_encoder.c simple/simple_decoder.c simple/x86.c simple/powerpc.c simple/ia64.c simple/arm.c simple/armthumb.c simple/sparc.c @@ -10,4 +10,4 @@ clean: rm -f *.o liblzma: - gcc -g -c -DHAVE__BOOL $(CFLAGS) $(LIBLZMA_INCLUDES) $(LIBLZMA_C) + gcc $(CFLAGS) $(LIBLZMA_INCLUDES) $(LIBLZMA_C) diff --git a/contrib/liblzma/common/sysdefs_schnaader.h b/contrib/liblzma/common/sysdefs_schnaader.h index b6a9f5a..611434e 100644 --- a/contrib/liblzma/common/sysdefs_schnaader.h +++ b/contrib/liblzma/common/sysdefs_schnaader.h @@ -8,7 +8,12 @@ #define HAVE_STDBOOL_H #endif -#define MYTHREAD_WIN95 +#ifdef UNIX + #include + #define MYTHREAD_POSIX +#else + #define MYTHREAD_WIN95 +#endif #define HAVE_ENCODER_LZMA1 1 #define HAVE_ENCODER_LZMA2 1 @@ -40,4 +45,4 @@ #define HAVE_CHECK_CRC64 1 #define HAVE_CHECK_SHA256 1 -#endif \ No newline at end of file +#endif diff --git a/contrib/liblzma/rangecoder/range_common.h b/contrib/liblzma/rangecoder/range_common.h index 5492c84..1333491 100644 --- a/contrib/liblzma/rangecoder/range_common.h +++ b/contrib/liblzma/rangecoder/range_common.h @@ -19,6 +19,7 @@ #else # include # include +# include #endif