From 4d84bbd0451722ca3301bbce7aec4e1675a20e90 Mon Sep 17 00:00:00 2001 From: inikep Date: Mon, 25 Jul 2016 17:49:49 +0200 Subject: [PATCH] updated CMake and VS projects to support decoder for v0.7 format --- .travis.yml | 6 +++--- projects/VS2008/zstd/zstd.vcproj | 8 ++++++++ projects/VS2010/zstd/zstd.vcxproj | 4 +++- projects/cmake/lib/CMakeLists.txt | 6 ++++-- 4 files changed, 18 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index f122d41b0..6cd3f5f62 100644 --- a/.travis.yml +++ b/.travis.yml @@ -47,9 +47,9 @@ matrix: - os: linux sudo: required env: PLATFORM="Ubuntu 12.04" CMD="make libc6install && make -C programs test32" - #- os: linux - # sudo: required - # env: PLATFORM="Ubuntu 12.04" CMD="make -C tests versionsTest" + - os: linux + sudo: required + env: PLATFORM="Ubuntu 12.04" CMD="make -C tests versionsTest" - os: linux sudo: required env: PLATFORM="Ubuntu 12.04" CMD="make libc6install asan32" diff --git a/projects/VS2008/zstd/zstd.vcproj b/projects/VS2008/zstd/zstd.vcproj index 129192a88..85a9f6bdc 100644 --- a/projects/VS2008/zstd/zstd.vcproj +++ b/projects/VS2008/zstd/zstd.vcproj @@ -428,6 +428,10 @@ RelativePath="..\..\..\lib\legacy\zstd_v06.c" > + + @@ -538,6 +542,10 @@ RelativePath="..\..\..\lib\legacy\zstd_v06.h" > + + diff --git a/projects/VS2010/zstd/zstd.vcxproj b/projects/VS2010/zstd/zstd.vcxproj index ed25f93d4..2dbfc3411 100644 --- a/projects/VS2010/zstd/zstd.vcxproj +++ b/projects/VS2010/zstd/zstd.vcxproj @@ -1,4 +1,4 @@ - + @@ -38,6 +38,7 @@ + @@ -62,6 +63,7 @@ + diff --git a/projects/cmake/lib/CMakeLists.txt b/projects/cmake/lib/CMakeLists.txt index ca841a966..36e8afa1d 100644 --- a/projects/cmake/lib/CMakeLists.txt +++ b/projects/cmake/lib/CMakeLists.txt @@ -93,7 +93,8 @@ IF (ZSTD_LEGACY_SUPPORT) ${LIBRARY_LEGACY_DIR}/zstd_v03.c ${LIBRARY_LEGACY_DIR}/zstd_v04.c ${LIBRARY_LEGACY_DIR}/zstd_v05.c - ${LIBRARY_LEGACY_DIR}/zstd_v06.c) + ${LIBRARY_LEGACY_DIR}/zstd_v06.c + ${LIBRARY_LEGACY_DIR}/zstd_v07.c) SET(Headers ${Headers} ${LIBRARY_LEGACY_DIR}/zstd_legacy.h @@ -102,7 +103,8 @@ IF (ZSTD_LEGACY_SUPPORT) ${LIBRARY_LEGACY_DIR}/zstd_v03.h ${LIBRARY_LEGACY_DIR}/zstd_v04.h ${LIBRARY_LEGACY_DIR}/zstd_v05.h - ${LIBRARY_LEGACY_DIR}/zstd_v06.h) + ${LIBRARY_LEGACY_DIR}/zstd_v06.h + ${LIBRARY_LEGACY_DIR}/zstd_v07.h) ENDIF (ZSTD_LEGACY_SUPPORT) IF (MSVC)