completed change from projects to build

This commit is contained in:
Yann Collet 2016-09-19 15:08:43 +02:00
parent 4c9a4c18a9
commit dbe70bad48
2 changed files with 3 additions and 3 deletions

View File

@ -108,7 +108,7 @@ IF (ZSTD_LEGACY_SUPPORT)
ENDIF (ZSTD_LEGACY_SUPPORT) ENDIF (ZSTD_LEGACY_SUPPORT)
IF (MSVC) IF (MSVC)
SET(MSVC_RESOURCE_DIR ${ROOT_DIR}/projects/VS2010/zstdlib) SET(MSVC_RESOURCE_DIR ${ROOT_DIR}/build/VS2010/zstdlib)
SET(PlatformDependResources ${MSVC_RESOURCE_DIR}/zstdlib.rc) SET(PlatformDependResources ${MSVC_RESOURCE_DIR}/zstdlib.rc)
ENDIF (MSVC) ENDIF (MSVC)

View File

@ -57,8 +57,8 @@ endif
ifneq (,$(filter Windows%,$(OS))) ifneq (,$(filter Windows%,$(OS)))
EXT =.exe EXT =.exe
VOID = nul VOID = nul
RES64_FILE = ..\projects\VS2010\zstd\generate_res\zstd64.res RES64_FILE = ..\build\VS2010\zstd\generate_res\zstd64.res
RES32_FILE = ..\projects\VS2010\zstd\generate_res\zstd32.res RES32_FILE = ..\build\VS2010\zstd\generate_res\zstd32.res
ifneq (,$(filter x86_64%,$(shell $(CC) -dumpmachine))) ifneq (,$(filter x86_64%,$(shell $(CC) -dumpmachine)))
RES_FILE = $(RES64_FILE) RES_FILE = $(RES64_FILE)
else else