Skip to content

Commit

Permalink
default linking for Linux is dynamic and static for Windows
Browse files Browse the repository at this point in the history
  • Loading branch information
inikep committed Oct 24, 2019
1 parent 278cd49 commit d983f55
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 2 deletions.
1 change: 1 addition & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ ifneq (,$(filter Windows%,$(OS)))
ifeq ($(COMPILER),clang)
DONT_BUILD_GLZA ?= 1
endif
BUILD_STATIC ?= 1
ifeq ($(BUILD_STATIC),1)
LDFLAGS += -lshell32 -lole32 -loleaut32 -static
endif
Expand Down
6 changes: 4 additions & 2 deletions NEWS
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
v1.8
- fixed gcc-9 and clang-9 compilation issues
- default linking for Linux is dynamic and static for Windows (can be changed with `make BUILD_STATIC=0/1`)
- added fast-lzma2 1.0.1
- added bzip2 1.0.8 (thanks to @tansy)
- blosclz updated to 2.0.0
- liblzg updated to 1.0.10
- libdeflate updated to v1.3
- lzma updated to 19.00
- liblzg updated to 1.0.10
- lzlib updated to 1.11
- lzma updated to 19.00
- lzo updated to 2.10
- lzsse updated to 2019-04-18 (1847c3e827)
- snappy updated to 2019-09-30 (e9e11b84e6)
Expand Down
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,8 @@ make BUILD_ARCH=32-bit
```

The default linking for Linux is dynamic and static for Windows. This can be changed with `make BUILD_STATIC=0/1`.

To remove one of compressors you can add `-DBENCH_REMOVE_XXX` to `DEFINES` in Makefile (e.g. `DEFINES += -DBENCH_REMOVE_LZ4` to remove LZ4).
You also have to remove corresponding `*.o` files (e.g. `lz4/lz4.o` and `lz4/lz4hc.o`).

Expand Down

0 comments on commit d983f55

Please sign in to comment.