]> git.ipfire.org Git - thirdparty/zstd.git/commitdiff
completed change from projects to build
authorYann Collet <yann.collet.73@gmail.com>
Mon, 19 Sep 2016 13:08:43 +0000 (15:08 +0200)
committerYann Collet <yann.collet.73@gmail.com>
Mon, 19 Sep 2016 13:08:43 +0000 (15:08 +0200)
build/cmake/lib/CMakeLists.txt
programs/Makefile

index 36e8afa1d2f2d8d2b3d0df86e3f2fc99c5ccce8d..c984145ba745db06a8034cb3ca645fc138e905b3 100644 (file)
@@ -108,7 +108,7 @@ IF (ZSTD_LEGACY_SUPPORT)
 ENDIF (ZSTD_LEGACY_SUPPORT)
 
 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)
 ENDIF (MSVC)
 
index 76130fe50fb8f870d80ca3c12772c9d3a3aa8c81..6e78d0ea90b37d490eab9f2911c2b6a80270c24e 100644 (file)
@@ -57,8 +57,8 @@ endif
 ifneq (,$(filter Windows%,$(OS)))
 EXT =.exe
 VOID = nul
-RES64_FILE = ..\projects\VS2010\zstd\generate_res\zstd64.res
-RES32_FILE = ..\projects\VS2010\zstd\generate_res\zstd32.res
+RES64_FILE = ..\build\VS2010\zstd\generate_res\zstd64.res
+RES32_FILE = ..\build\VS2010\zstd\generate_res\zstd32.res
 ifneq (,$(filter x86_64%,$(shell $(CC) -dumpmachine)))
     RES_FILE = $(RES64_FILE)
 else