Skip to content

Commit 8570cc4

Browse files
committed
libs: delete vendored zlib, it was only used by PNaCl because of precompiled freetype when building cgame
1 parent 5f7b524 commit 8570cc4

28 files changed

+2
-12873
lines changed

CMakeLists.txt

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -640,15 +640,8 @@ if ( USE_STATIC_LIBS )
640640
endif()
641641

642642
# zlib
643-
if (BUILD_CLIENT OR BUILD_TTY_CLIENT OR BUILD_SERVER OR BUILD_DUMMY_APP OR (BUILD_CGAME AND NACL AND NOT USE_NACL_SAIGO))
644-
if (NOT NACL)
645-
find_package(ZLIB REQUIRED)
646-
else()
647-
add_library(srclibs-zlib EXCLUDE_FROM_ALL ${ZLIBLIST})
648-
set_target_properties(srclibs-zlib PROPERTIES POSITION_INDEPENDENT_CODE ${GAME_PIE} FOLDER "libs")
649-
set(ZLIB_INCLUDE_DIRS ${LIB_DIR}/zlib)
650-
set(ZLIB_LIBRARIES srclibs-zlib)
651-
endif()
643+
if (BUILD_CLIENT OR BUILD_TTY_CLIENT OR BUILD_SERVER OR BUILD_DUMMY_APP)
644+
find_package(ZLIB REQUIRED)
652645
set(LIBS_BASE ${LIBS_BASE} ${ZLIB_LIBRARIES})
653646
include_directories(${ZLIB_INCLUDE_DIRS})
654647
endif()

libs/zlib/adler32.c

Lines changed: 0 additions & 179 deletions
This file was deleted.

libs/zlib/compress.c

Lines changed: 0 additions & 80 deletions
This file was deleted.

0 commit comments

Comments
 (0)