[BTRFS][ZLIB] Addendum to r72576. CORE-11937

svn path=/trunk/; revision=72577

diff --git a/reactos/drivers/filesystems/btrfs/CMakeLists.txt b/reactos/drivers/filesystems/btrfs/CMakeLists.txt
index 7e98893..730aa1f 100644 (file)
--- a/reactos/drivers/filesystems/btrfs/CMakeLists.txt
+++ b/reactos/drivers/filesystems/btrfs/CMakeLists.txt
@@ -1,4 +1,3 @@
-add_subdirectory(zlib)
 
 include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/drivers
                     ${REACTOS_SOURCE_DIR}/sdk/include/reactos/libs/zlib
@@ -36,4 +35,3 @@ target_link_libraries(btrfs ntoskrnl_vista zlib_solo ${PSEH_LIB})
 add_importlibs(btrfs ntoskrnl hal)
 add_pch(btrfs btrfs_drv.h SOURCE)
 add_cd_file(TARGET btrfs DESTINATION reactos/system32/drivers NO_CAB FOR all)
-

diff --git a/reactos/drivers/filesystems/btrfs/zlib/CMakeLists.txt b/reactos/drivers/filesystems/btrfs/zlib/CMakeLists.txt
deleted file mode 100644 (file)
index 06aa88d..0000000
--- a/reactos/drivers/filesystems/btrfs/zlib/CMakeLists.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-
-include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/libs/zlib
-                    inc)
-
-list(APPEND SOURCE
-    ${REACTOS_SOURCE_DIR}/sdk/lib/3rdparty/zlib/adler32.c
-    ${REACTOS_SOURCE_DIR}/sdk/lib/3rdparty/zlib/crc32.c
-    ${REACTOS_SOURCE_DIR}/sdk/lib/3rdparty/zlib/deflate.c
-    ${REACTOS_SOURCE_DIR}/sdk/lib/3rdparty/zlib/inffast.c
-    ${REACTOS_SOURCE_DIR}/sdk/lib/3rdparty/zlib/inflate.c
-    ${REACTOS_SOURCE_DIR}/sdk/lib/3rdparty/zlib/inftrees.c
-    ${REACTOS_SOURCE_DIR}/sdk/lib/3rdparty/zlib/trees.c
-    ${REACTOS_SOURCE_DIR}/sdk/lib/3rdparty/zlib/zutil.c)
-
-add_library(zlib_solo ${SOURCE})
-
-add_definitions(-DZ_SOLO)

diff --git a/reactos/sdk/lib/3rdparty/zlib/CMakeLists.txt b/reactos/sdk/lib/3rdparty/zlib/CMakeLists.txt
index 72468cd..6685a76 100644 (file)
--- a/reactos/sdk/lib/3rdparty/zlib/CMakeLists.txt
+++ b/reactos/sdk/lib/3rdparty/zlib/CMakeLists.txt
@@ -2,25 +2,29 @@
 add_definitions(-DNO_VIZ)
 include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/libs/zlib)
 
-list(APPEND SOURCE
+list(APPEND SOLO_SOURCE
     adler32.c
-    compress.c
     crc32.c
     deflate.c
-    gzclose.c
-    gzlib.c
-    gzread.c
-    gzwrite.c
-    infback.c
     inffast.c
     inflate.c
     inftrees.c
     trees.c
-    uncompr.c
     zutil.c)
 
+list(APPEND SOURCE
+    compress.c
+    gzclose.c
+    gzlib.c
+    gzread.c
+    gzwrite.c
+    infback.c
+    uncompr.c)
+
 if(CMAKE_CROSSCOMPILING)
-    add_library(zlib ${SOURCE})
+    add_library(zlib ${SOURCE} ${SOLO_SOURCE})
+    add_library(zlib_solo ${SOLO_SOURCE})
+    add_target_compile_definitions(zlib_solo Z_SOLO)
 else()
-    add_library(zlibhost ${SOURCE})
+    add_library(zlibhost ${SOURCE} ${SOLO_SOURCE})
 endif()