summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorPrzemyslaw Skibinski <inikep@gmail.com>2016-11-15 10:06:16 (GMT)
committerPrzemyslaw Skibinski <inikep@gmail.com>2016-11-15 10:06:16 (GMT)
commitf71340ce1d8daa9f13cf4f1ecf2a21f23e3790ff (patch)
treec96a24a0a9f4c6f6bb08a01f4e633475f7ffc121 /lib
parentf3f59bef4f6aedb7f9b81f4f96a5eabae813bc8f (diff)
downloadlz4-f71340ce1d8daa9f13cf4f1ecf2a21f23e3790ff.zip
lz4-f71340ce1d8daa9f13cf4f1ecf2a21f23e3790ff.tar.gz
lz4-f71340ce1d8daa9f13cf4f1ecf2a21f23e3790ff.tar.bz2
DLL dependencies moved to lib/dll/
Diffstat (limited to 'lib')
-rw-r--r--lib/Makefile6
-rw-r--r--lib/README.md6
-rw-r--r--lib/dll/liblz4.def (renamed from lib/liblz4.def)0
3 files changed, 6 insertions, 6 deletions
diff --git a/lib/Makefile b/lib/Makefile
index d098846..4c9b929 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -86,8 +86,8 @@ endif
liblz4: *.c
@echo compiling dynamic library $(LIBVER)
ifneq (,$(filter Windows%,$(OS)))
- @$(CC) $(FLAGS) -DLZ4_DLL_EXPORT=1 -shared $^ -o $@.dll
- dlltool -D liblz4.dll -d liblz4.def -l liblz4.dll.a
+ @$(CC) $(FLAGS) -DLZ4_DLL_EXPORT=1 -shared $^ -o dll\$@.dll
+ dlltool -D dll\liblz4.dll -d dll\liblz4.def -l dll\liblz4.lib
else
@$(CC) $(FLAGS) -shared $^ -fPIC $(SONAME_FLAGS) -o $@.$(SHARED_EXT_VER)
@echo creating versioned links
@@ -96,7 +96,7 @@ else
endif
clean:
- @$(RM) -f core *.o *.a *.$(SHARED_EXT) *.$(SHARED_EXT).* liblz4.pc
+ @$(RM) -f core *.o *.a *.$(SHARED_EXT) *.$(SHARED_EXT).* liblz4.pc dll/liblz4.dll dll/liblz4.lib
@echo Cleaning library completed
diff --git a/lib/README.md b/lib/README.md
index 19f429a..430be1f 100644
--- a/lib/README.md
+++ b/lib/README.md
@@ -41,12 +41,12 @@ It must be used with static linking ***only***.
#### Using MinGW+MSYS to create DLL
DLL can be created using MinGW+MSYS with the `make liblz4` command.
-This command creates `liblz4.dll` and the import library `liblz4.dll.a`.
+This command creates `dll\liblz4.dll` and the import library `dll\liblz4.lib`.
To compile a project the import library has to be added to linking options.
It means that if a project that uses LZ4 consists of a single `test-dll.c`
-file it should be compiled with "liblz4.dll.a". For example:
+file it should be compiled with "liblz4.lib". For example:
```
- gcc $(CFLAGS) test-dll.c -o test-dll liblz4.dll.a
+ gcc $(CFLAGS) test-dll.c -o test-dll liblz4.lib
```
diff --git a/lib/liblz4.def b/lib/dll/liblz4.def
index 0ace223..0ace223 100644
--- a/lib/liblz4.def
+++ b/lib/dll/liblz4.def