facebook/zstd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed MinGW compilation

Browse Source
This commit is contained in:
Przemyslaw Skibinski 2016-11-03 12:59:20 +01:00
parent 1f60eb6b17
commit 3a415594b1
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Makefile
View File

@ -14,10 +14,12 @@ ZWRAPDIR = zlibWrapper
TESTDIR = tests TESTDIR = tests
# Define nul output # Define nul output
ifneq (,$(filter Windows%,$(OS)))
VOID = nul
else
VOID = /dev/null VOID = /dev/null
ifneq (,$(filter Windows%,$(OS)))
EXT =.exe
else
EXT =
endif endif
.PHONY: default .PHONY: default
@ -35,7 +37,7 @@ lib:
zstd: zstd:
@$(MAKE) -C $(PRGDIR) @$(MAKE) -C $(PRGDIR)
cp $(PRGDIR)/zstd . cp $(PRGDIR)/zstd$(EXT) .
.PHONY: zlibwrapper .PHONY: zlibwrapper
zlibwrapper: zlibwrapper:
@ -51,7 +53,7 @@ clean:
@$(MAKE) -C $(PRGDIR) $@ > $(VOID) @$(MAKE) -C $(PRGDIR) $@ > $(VOID)
@$(MAKE) -C $(TESTDIR) $@ > $(VOID) @$(MAKE) -C $(TESTDIR) $@ > $(VOID)
@$(MAKE) -C $(ZWRAPDIR) $@ > $(VOID) @$(MAKE) -C $(ZWRAPDIR) $@ > $(VOID)
@$(RM) zstd @$(RM) zstd$(EXT)
@echo Cleaning completed @echo Cleaning completed

2
lib/Makefile
View File

@ -73,9 +73,11 @@ $(LIBZSTD): LDFLAGS += -shared -fPIC
$(LIBZSTD): $(ZSTD_FILES) $(LIBZSTD): $(ZSTD_FILES)
@echo compiling dynamic library $(LIBVER) @echo compiling dynamic library $(LIBVER)
@$(CC) $(FLAGS) $^ $(LDFLAGS) $(SONAME_FLAGS) -o $@ @$(CC) $(FLAGS) $^ $(LDFLAGS) $(SONAME_FLAGS) -o $@
ifeq (,$(filter Windows%,$(OS)))
@echo creating versioned links @echo creating versioned links
@ln -sf $@.$(SHARED_EXT_VER) libzstd.$(SHARED_EXT_MAJOR) @ln -sf $@.$(SHARED_EXT_VER) libzstd.$(SHARED_EXT_MAJOR)
@ln -sf $@.$(SHARED_EXT_VER) libzstd.$(SHARED_EXT) @ln -sf $@.$(SHARED_EXT_VER) libzstd.$(SHARED_EXT)
endif
libzstd : $(LIBZSTD) libzstd : $(LIBZSTD)

2
programs/Makefile
View File

@ -56,7 +56,6 @@ endif
# Define *.exe as extension for Windows systems # Define *.exe as extension for Windows systems
ifneq (,$(filter Windows%,$(OS))) ifneq (,$(filter Windows%,$(OS)))
EXT =.exe EXT =.exe
VOID = nul
RES64_FILE = windres\zstd64.res RES64_FILE = windres\zstd64.res
RES32_FILE = windres\zstd32.res RES32_FILE = windres\zstd32.res
ifneq (,$(filter x86_64%,$(shell $(CC) -dumpmachine))) ifneq (,$(filter x86_64%,$(shell $(CC) -dumpmachine)))
@ -66,7 +65,6 @@ else
endif endif
else else
EXT = EXT =
VOID = /dev/null
endif endif