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

Merge pull request #366 from inikep/dev

Browse Source 
zstd.exe has FileVersion and ProductVersion with 32-bit gcc (MinGW)
This commit is contained in:
Yann Collet authored and GitHub committed 2016-09-14 19:42:29 +02:00
2 parents 3ecbe6a37c c03f15e89d
commit 0b01a8ef09
6 files changed
+12 -6
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

programs/Makefile
+8 -2
View File
@@ -57,7 +57,13 @@ endif
ifneq (,$(filter Windows%,$(OS)))
EXT =.exe
VOID = nul
RES_FILE = ..\projects\VS2010\zstd\zstd.res
RES64_FILE = ..\projects\VS2010\zstd\generate_res\zstd64.res
RES32_FILE = ..\projects\VS2010\zstd\generate_res\zstd32.res
ifneq (,$(filter x86_64%,$(shell $(CC) -dumpmachine)))
RES_FILE = $(RES64_FILE)
else
RES_FILE = $(RES32_FILE)
endif
else
EXT =
VOID = /dev/null
@@ -83,7 +89,7 @@ zstd : $(ZSTDDECOMP_O) $(ZSTD_FILES) $(ZSTDLEGACY_FILES) $(ZDICT_FILES) \
zstd32 : $(ZSTDDECOMP32_O) $(ZSTD_FILES) $(ZSTDLEGACY_FILES) $(ZDICT_FILES) \
zstdcli.c fileio.c bench.c datagen.c dibio.c
$(CC) -m32 $(FLAGS) -DZSTD_LEGACY_SUPPORT=$(ZSTD_LEGACY_SUPPORT) $^ -o $@$(EXT)
$(CC) -m32 $(FLAGS) -DZSTD_LEGACY_SUPPORT=$(ZSTD_LEGACY_SUPPORT) $^ $(RES32_FILE) -o $@$(EXT)
zstd_nolegacy :