Skip to content

Commit

Permalink
libs: delete vendored zlib, it was only used by PNaCl because of prec…
Browse files Browse the repository at this point in the history
…ompiled freetype when building cgame
  • Loading branch information
illwieckz committed Nov 20, 2024
1 parent ff63572 commit 51e613b
Show file tree
Hide file tree
Showing 28 changed files with 2 additions and 12,873 deletions.
11 changes: 2 additions & 9 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -640,15 +640,8 @@ if ( USE_STATIC_LIBS )
endif()

# zlib
if (BUILD_CLIENT OR BUILD_TTY_CLIENT OR BUILD_SERVER OR BUILD_DUMMY_APP OR (BUILD_CGAME AND NACL AND NOT USE_NACL_SAIGO))
if (NOT NACL)
find_package(ZLIB REQUIRED)
else()
add_library(srclibs-zlib EXCLUDE_FROM_ALL ${ZLIBLIST})
set_target_properties(srclibs-zlib PROPERTIES POSITION_INDEPENDENT_CODE ${GAME_PIE} FOLDER "libs")
set(ZLIB_INCLUDE_DIRS ${LIB_DIR}/zlib)
set(ZLIB_LIBRARIES srclibs-zlib)
endif()
if (BUILD_CLIENT OR BUILD_TTY_CLIENT OR BUILD_SERVER OR BUILD_DUMMY_APP)
find_package(ZLIB REQUIRED)
set(LIBS_BASE ${LIBS_BASE} ${ZLIB_LIBRARIES})
include_directories(${ZLIB_INCLUDE_DIRS})
endif()
Expand Down
179 changes: 0 additions & 179 deletions libs/zlib/adler32.c

This file was deleted.

80 changes: 0 additions & 80 deletions libs/zlib/compress.c

This file was deleted.

Loading

0 comments on commit 51e613b

Please sign in to comment.