From 93f5d28abfe600e8f88cbc9eae740165ae6a238e Mon Sep 17 00:00:00 2001 From: Timo Kreuzer Date: Thu, 25 Nov 2010 22:14:07 +0000 Subject: [PATCH] [CMAKE] Link libjpg explicitly to kernel32 and link to mingw_common on MSVC builds svn path=/branches/cmake-bringup/; revision=49793 --- dll/3rdparty/libjpeg/CMakeLists.txt | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dll/3rdparty/libjpeg/CMakeLists.txt b/dll/3rdparty/libjpeg/CMakeLists.txt index 1c78830210a..f9bb5533caa 100644 --- a/dll/3rdparty/libjpeg/CMakeLists.txt +++ b/dll/3rdparty/libjpeg/CMakeLists.txt @@ -61,7 +61,12 @@ add_library(libjpeg SHARED set_entrypoint(libjpeg 0) -add_importlibs(libjpeg msvcrt) +if(MSVC) +# for _fltused +target_link_libraries(libjpeg mingw_common) +endif() + +add_importlibs(libjpeg msvcrt kernel32) add_dependencies(libjpeg psdk buildno_header)