diff options
| -rw-r--r-- | appveyor.yml | 20 | ||||
| -rw-r--r-- | lib/dll/example/Makefile (renamed from lib/dll/fullbench-dll/Makefile) | 12 | ||||
| -rw-r--r-- | lib/dll/example/README.md (renamed from lib/dll/README.md) | 0 | ||||
| -rw-r--r-- | lib/dll/example/fullbench-dll.sln (renamed from lib/dll/fullbench-dll/fullbench-dll.sln) | 0 | ||||
| -rw-r--r-- | lib/dll/example/fullbench-dll.vcxproj (renamed from lib/dll/fullbench-dll/fullbench-dll.vcxproj) | 0 |
5 files changed, 17 insertions, 15 deletions
diff --git a/appveyor.yml b/appveyor.yml index 9643b71..dd9a700 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -55,26 +55,26 @@ build_script: ) ) - if [%COMPILER%]==[gcc] if not [%PLATFORM%]==[clang] ( - MKDIR bin\dll bin\static bin\fullbench bin\include && - COPY tests\fullbench.c bin\fullbench\ && - COPY lib\xxhash.c bin\fullbench\ && - COPY lib\xxhash.h bin\fullbench\ && + MKDIR bin\dll bin\static bin\example bin\include && + COPY tests\fullbench.c bin\example\ && + COPY lib\xxhash.c bin\example\ && + COPY lib\xxhash.h bin\example\ && COPY lib\lz4.h bin\include\ && COPY lib\lz4hc.h bin\include\ && COPY lib\lz4frame.h bin\include\ && - COPY lib\dll\liblz4.* bin\dll\ && - COPY lib\dll\fullbench-dll\Makefile bin\ && - COPY lib\dll\fullbench-dll\fullbench-dll.* bin\fullbench\ && - COPY lib\dll\README.md bin\ && COPY lib\liblz4.a bin\static\liblz4_static.lib && + COPY lib\dll\liblz4.* bin\dll\ && + COPY lib\dll\example\Makefile bin\example\ && + COPY lib\dll\example\fullbench-dll.* bin\example\ && + COPY lib\dll\example\README.md bin\ && COPY programs\lz4.exe bin\lz4.exe ) - if [%COMPILER%]==[gcc] if [%PLATFORM%]==[mingw64] ( - 7z.exe a bin\liblz4_x64.zip .\bin\lz4.exe .\bin\fullbench .\bin\dll .\bin\static .\bin\include .\bin\Makefile .\bin\README.md && + 7z.exe a bin\lz4_x64.zip .\bin\lz4.exe .\bin\fullbench .\bin\dll .\bin\static .\bin\include .\bin\Makefile .\bin\README.md && appveyor PushArtifact bin\lz4_x64.zip ) - if [%COMPILER%]==[gcc] if [%PLATFORM%]==[mingw32] ( - 7z.exe a bin\liblz4_x86.zip .\bin\lz4.exe .\bin\fullbench .\bin\dll .\bin\static .\bin\include .\bin\Makefile .\bin\README.md && + 7z.exe a bin\lz4_x86.zip .\bin\lz4.exe .\bin\fullbench .\bin\dll .\bin\static .\bin\include .\bin\Makefile .\bin\README.md && appveyor PushArtifact bin\lz4_x86.zip ) - if [%COMPILER%]==[gcc] (COPY tests\fullbench.exe programs\) diff --git a/lib/dll/fullbench-dll/Makefile b/lib/dll/example/Makefile index 680e1b6..e987956 100644 --- a/lib/dll/fullbench-dll/Makefile +++ b/lib/dll/example/Makefile @@ -24,7 +24,9 @@ # ########################################################################## VOID := /dev/null -LZ4DIR := ./include +LZ4DIR := ../include +LIBDIR := ../static +DLLDIR := ../dll CFLAGS ?= -O3 # can select custom flags. For example : CFLAGS="-O2 -g" make CFLAGS += -Wall -Wextra -Wundef -Wcast-qual -Wcast-align -Wshadow -Wswitch-enum \ @@ -50,11 +52,11 @@ default: all all: fullbench-dll fullbench-lib -fullbench-lib: fullbench/fullbench.c fullbench/xxhash.c - $(CC) $(FLAGS) $^ -o $@$(EXT) static/liblz4_static.lib +fullbench-lib: fullbench.c xxhash.c + $(CC) $(FLAGS) $^ -o $@$(EXT) $(LIBDIR)/liblz4_static.lib -fullbench-dll: fullbench/fullbench.c fullbench/xxhash.c - $(CC) $(FLAGS) $^ -o $@$(EXT) -DLZ4_DLL_IMPORT=1 dll/liblz4.dll +fullbench-dll: fullbench.c xxhash.c + $(CC) $(FLAGS) $^ -o $@$(EXT) -DLZ4_DLL_IMPORT=1 $(DLLDIR)/liblz4.dll clean: @$(RM) fullbench-dll$(EXT) fullbench-lib$(EXT) \ diff --git a/lib/dll/README.md b/lib/dll/example/README.md index bb3dbd6..bb3dbd6 100644 --- a/lib/dll/README.md +++ b/lib/dll/example/README.md diff --git a/lib/dll/fullbench-dll/fullbench-dll.sln b/lib/dll/example/fullbench-dll.sln index 72e302e..72e302e 100644 --- a/lib/dll/fullbench-dll/fullbench-dll.sln +++ b/lib/dll/example/fullbench-dll.sln diff --git a/lib/dll/fullbench-dll/fullbench-dll.vcxproj b/lib/dll/example/fullbench-dll.vcxproj index cdb5534..cdb5534 100644 --- a/lib/dll/fullbench-dll/fullbench-dll.vcxproj +++ b/lib/dll/example/fullbench-dll.vcxproj |