Skip to content

Commit adf2d03

Browse files
committed
cmake: building nexe against zlib is only required by cgame because of freetype on PNaCl
1 parent 2aa72f7 commit adf2d03

File tree

1 file changed

+1
-2
lines changed

1 file changed

+1
-2
lines changed

CMakeLists.txt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -636,9 +636,8 @@ if ( USE_STATIC_LIBS )
636636
endif()
637637
endif()
638638

639-
640639
# zlib
641-
if (BUILD_CLIENT OR BUILD_TTY_CLIENT OR BUILD_SERVER OR BUILD_DUMMY_APP OR NACL)
640+
if (BUILD_CLIENT OR BUILD_TTY_CLIENT OR BUILD_SERVER OR BUILD_DUMMY_APP OR (BUILD_CGAME AND NACL AND NOT USE_NACL_SAIGO))
642641
if (NOT NACL)
643642
find_package(ZLIB REQUIRED)
644643
else()

0 commit comments

Comments
 (0)