ddidderr/zstd-rs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed libzstd.dll compilation on mingw

Browse Source 
and zstd linking
This commit is contained in:
Yann Collet
2020-10-22 11:52:19 -07:00
parent 91a8cb9559
commit e3867fb735
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/Makefile
+4 -4
View File
@@ -236,8 +236,8 @@ libzstd.a: $(ZSTD_STATLIB_DIR)/libzstd.a
ifneq (,$(filter Windows%,$(TARGET_SYSTEM))) ifneq (,$(filter Windows%,$(TARGET_SYSTEM)))
LIBZSTD = dll\libzstd.dll LIBZSTD = dll\libzstd.dll
$(ZSTD_DYNLIB_DIR)/$(LIBZSTD): | $(ZSTD_DYNLIB_DIR) $(LIBZSTD):
$(ZSTD_DYNLIB_DIR)/$(LIBZSTD): $(ZSTD_FILES) $(LIBZSTD): $(ZSTD_FILES)
@echo compiling dynamic library $(LIBVER) @echo compiling dynamic library $(LIBVER)
$(CC) $(FLAGS) -DZSTD_DLL_EXPORT=1 -Wl,--out-implib,dll\libzstd.dll.a -shared $^ -o $@ $(CC) $(FLAGS) -DZSTD_DLL_EXPORT=1 -Wl,--out-implib,dll\libzstd.dll.a -shared $^ -o $@
@@ -254,12 +254,12 @@ $(ZSTD_DYNLIB_DIR)/$(LIBZSTD): $(ZSTD_DYNLIB_OBJ)
$(Q)ln -sf $@ libzstd.$(SHARED_EXT_MAJOR) $(Q)ln -sf $@ libzstd.$(SHARED_EXT_MAJOR)
$(Q)ln -sf $@ libzstd.$(SHARED_EXT) $(Q)ln -sf $@ libzstd.$(SHARED_EXT)
endif
.PHONY: $(LIBZSTD) # must be run every time .PHONY: $(LIBZSTD) # must be run every time
$(LIBZSTD): $(ZSTD_DYNLIB_DIR)/$(LIBZSTD) $(LIBZSTD): $(ZSTD_DYNLIB_DIR)/$(LIBZSTD)
$(Q)ln -sf $< $@ $(Q)ln -sf $< $@
endif
.PHONY: libzstd .PHONY: libzstd
libzstd : $(LIBZSTD) libzstd : $(LIBZSTD)
programs/Makefile
+1 -1
View File
@@ -217,7 +217,7 @@ ifneq (,$(filter Windows%,$(OS)))
zstd : $(RES_FILE) zstd : $(RES_FILE)
endif endif
zstd : $(BUILD_DIR)/zstd zstd : $(BUILD_DIR)/zstd
$(Q)ln -sf $^ $@ $(Q)ln -sf $< $@
@echo zstd build completed @echo zstd build completed
.PHONY: zstd-release .PHONY: zstd-release