Skip to content

Commit f856db3

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

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
@@ -634,9 +634,8 @@ if ( USE_STATIC_LIBS )
634634
endif()
635635
endif()
636636

637-
638637
# zlib
639-
if (BUILD_CLIENT OR BUILD_TTY_CLIENT OR BUILD_SERVER OR BUILD_DUMMY_APP OR NACL)
638+
if (BUILD_CLIENT OR BUILD_TTY_CLIENT OR BUILD_SERVER OR BUILD_DUMMY_APP OR (BUILD_CGAME AND NACL AND NOT USE_NACL_SAIGO))
640639
if (NOT NACL)
641640
find_package(ZLIB REQUIRED)
642641
else()

0 commit comments

Comments
 (0)