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

Merge pull request #1371 from jaladreips/dev-cmake 

Fix MSVC building issues by correcting CMakeLists.txt
pyro-refactor
Mateusz Przybył 2021-02-22 20:49:27 +01:00 committed by GitHub
parent fbbe25b25e c336a67afa
commit 52446c1049
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/CMakeLists.txt
View File

@ -48,25 +48,30 @@ elseif(PLATFORM_WINDOWS)
if(${MSVC_STATIC}) if(${MSVC_STATIC})
if (${OPENAL_SOUND}) if (${OPENAL_SOUND})
find_library(FLAC_LIBRARY NAMES flac.lib) find_library(FLAC_LIBRARY NAMES flac)
find_library(VORBIS_LIBRARY NAMES vorbis.lib) find_library(VORBIS_LIBRARY NAMES vorbis)
find_library(VORBISENC_LIBRARY NAMES vorbisenc.lib) find_library(VORBISENC_LIBRARY NAMES vorbisenc)
find_library(OGG_LIBRARY NAMES ogg.lib) find_library(OGG_LIBRARY NAMES ogg)
find_library(OPUS_LIBRARY NAMES opus)
set(OPENAL_MSVC_LIBS set(OPENAL_MSVC_LIBS
${FLAC_LIBRARY} ${FLAC_LIBRARY}
${VORBIS_LIBRARY} ${VORBIS_LIBRARY}
${VORBISENC_LIBRARY} ${VORBISENC_LIBRARY}
${OGG_LIBRARY} ${OGG_LIBRARY}
${OPUS_LIBRARY}
) )
endif() endif()
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)
set(MSVC_LIBS set(MSVC_LIBS
${LIBINTL_LIBRARY} ${LIBINTL_LIBRARY}
${OPENAL_MSVC_LIBS} ${OPENAL_MSVC_LIBS}
@ -77,6 +82,9 @@ elseif(PLATFORM_WINDOWS)
${FREETYPE_LIBRARY} ${FREETYPE_LIBRARY}
${ICONV_LIBRARY} ${ICONV_LIBRARY}
${CHARSET_LIBRARY} ${CHARSET_LIBRARY}
${BROTLICOMMON_LIBRARY}
${BROTLIENC_LIBRARY}
${BROTLIDEC_LIBRARY}
winmm.lib winmm.lib
dxguid.lib dxguid.lib
imm32.lib imm32.lib