immibis
/
colobot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Link brotli since freetype can now depend on it 

The fixes are from PR #1371
fix-squashed-planets
MrSimbax 2021-09-04 20:31:22 +02:00
parent 84d23e91ed
commit 65e12621ff
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/CMakeLists.txt
View File

@ -526,13 +526,16 @@ elseif(PLATFORM_WINDOWS)
if(USE_STATIC_RUNTIME) # Since we're using static runtime, assume every external library is static too if(USE_STATIC_RUNTIME) # Since we're using static runtime, assume every external library is static too
find_package(Intl REQUIRED) find_package(Intl REQUIRED)
find_library(BZ2_LIBRARY NAMES bz2.lib) find_library(BZ2_LIBRARY NAMES bz2)
find_library(JPEG_LIBRARY NAMES jpeg.lib) find_library(JPEG_LIBRARY NAMES jpeg)
find_library(TIFF_LIBRARY NAMES tiff.lib) find_library(TIFF_LIBRARY NAMES tiff)
find_library(LZMA_LIBRARY NAMES lzma.lib) find_library(LZMA_LIBRARY NAMES lzma)
find_library(FREETYPE_LIBRARY NAMES freetype.lib) find_library(FREETYPE_LIBRARY NAMES freetype)
find_library(ICONV_LIBRARY NAMES libiconv.lib) find_library(ICONV_LIBRARY NAMES iconv)
find_library(CHARSET_LIBRARY NAMES libcharset.lib) find_library(CHARSET_LIBRARY NAMES charset)
find_library(BROTLICOMMON_LIBRARY NAMES brotlicommon-static)
find_library(BROTLIENC_LIBRARY NAMES brotlienc-static)
find_library(BROTLIDEC_LIBRARY NAMES brotlidec-static)
target_link_libraries(colobotbase PUBLIC target_link_libraries(colobotbase PUBLIC
Gettext::Intl Gettext::Intl
@ -543,6 +546,9 @@ elseif(PLATFORM_WINDOWS)
${FREETYPE_LIBRARY} ${FREETYPE_LIBRARY}
${ICONV_LIBRARY} ${ICONV_LIBRARY}
${CHARSET_LIBRARY} ${CHARSET_LIBRARY}
${BROTLICOMMON_LIBRARY}
${BROTLIENC_LIBRARY}
${BROTLIDEC_LIBRARY}
# why # why
winmm.lib winmm.lib