Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -150,8 +150,8 @@ Unzip the file "Kanzi_VS2022.zip" in place.
The solution generates a Windows 64 binary and library.

### mingw-w64
Go to the source directory and run 'make clean && mingw32-make.exe kanzi'. The Makefile contains
all the necessary targets. Tested successfully on Win64 with mingw-w64 g++ 8.1.0.
Go to the source directory and run 'make clean && mingw32-make.exe kanzi'. The Makefile contains
all the necessary targets. Tested successfully on Win64 with mingw-w64 g++ 8.1.0.
Multithreading is supported with g++ version 5.0.0 or newer.
Builds successfully with C++11, C++14, C++17.

Expand All @@ -163,7 +163,7 @@ Builds successfully with C++98, C++11, C++14, C++17, C++20.

### macOS
Go to the source directory and run 'make clean && make kanzi'. The Makefile contains all the necessary
targets. Build successfully on MacOs with several versions of clang++.
targets. Build successfully on MacOs with several versions of clang++.
Builds successfully with C++98, C++11, C++14, C++17, C++20.

### BSD
Expand Down Expand Up @@ -192,7 +192,7 @@ cmake ..
make
ctest
```
By default, the cmake build generates a dynamically linked executable.
By default, the cmake build generates a dynamically linked executable.
Choose ```make kanzi_static``` to build a statically linked executable.

Credits
Expand All @@ -204,7 +204,7 @@ Yuta Mori,
Ilya Muravyov,
Neal Burns,
Fabian Giesen,
Jarek Duda,
Jarek Duda,
Ilya Grebnov

Disclaimer
Expand Down
3 changes: 2 additions & 1 deletion src/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,8 @@ STATIC_DECOMP_LIB := lib$(APP)decomp$(STATIC_LIB_SUFFIX)
SHARED_COMP_LIB := lib$(APP)comp$(SHARED_LIB_SUFFIX)
SHARED_DECOMP_LIB := lib$(APP)decomp$(SHARED_LIB_SUFFIX)

all: lib test $(APP_STATIC) $(APP_DYNAMIC)

libcomp: $(STATIC_COMP_LIB) $(SHARED_COMP_LIB)

libdecomp: $(STATIC_DECOMP_LIB) $(SHARED_DECOMP_LIB)
Expand Down Expand Up @@ -226,7 +228,6 @@ kanzi_dynamic: LDFLAGS := $(filter-out -static,$(LDFLAGS))
kanzi_dynamic: $(LIB_OBJECTS) $(APP_OBJECTS)
$(CXX) $^ -o ../bin/kanzi_dynamic$(PROG_SUFFIX) $(LDFLAGS)

all: lib test $(APP_STATIC) $(APP_DYNAMIC)

# Install / uninstall (may require sudo or admin rights)
ifeq ($(DETECTED_OS),Windows)
Expand Down