Author: akhaldi
Date: Sun Sep 4 17:31:50 2016
New Revision: 72577
URL: http://svn.reactos.org/svn/reactos?rev=72577&view=rev
Log:
[BTRFS][ZLIB] Addendum to r72576. CORE-11937
Removed:
trunk/reactos/drivers/filesystems/btrfs/zlib/
Modified:
trunk/reactos/drivers/filesystems/btrfs/CMakeLists.txt
trunk/reactos/sdk/lib/3rdparty/zlib/CMakeLists.txt
Modified: trunk/reactos/drivers/filesystems/btrfs/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/btrfs/CMakeLists.txt?rev=72577&r1=72576&r2=72577&view=diff
==============================================================================
--- trunk/reactos/drivers/filesystems/btrfs/CMakeLists.txt [iso-8859-1]
(original)
+++ trunk/reactos/drivers/filesystems/btrfs/CMakeLists.txt [iso-8859-1]
Sun Sep 4 17:31:50 2016
@@ -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 @@
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)
-
Modified: trunk/reactos/sdk/lib/3rdparty/zlib/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/zlib/CMakeLists.txt?rev=72577&r1=72576&r2=72577&view=diff
==============================================================================
--- trunk/reactos/sdk/lib/3rdparty/zlib/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/sdk/lib/3rdparty/zlib/CMakeLists.txt [iso-8859-1] Sun Sep 4
17:31:50 2016
@@ -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
+ inffast.c
+ inflate.c
+ inftrees.c
+ trees.c
+ zutil.c)
+
+list(APPEND SOURCE
+ compress.c
gzclose.c
gzlib.c
gzread.c
gzwrite.c
infback.c
- inffast.c
- inflate.c
- inftrees.c
- trees.c
- uncompr.c
- zutil.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()
