[ros-diffs] [tkreuzer] 49793: [CMAKE] Link libjpg explicitly to kernel32 and link to mingw_common on MSVC builds

tkreuzer at svn.reactos.org tkreuzer at svn.reactos.org
Thu Nov 25 22:14:08 UTC 2010


Author: tkreuzer
Date: Thu Nov 25 22:14:07 2010
New Revision: 49793

URL: http://svn.reactos.org/svn/reactos?rev=49793&view=rev
Log:
[CMAKE]
Link libjpg explicitly to kernel32 and link to mingw_common on MSVC builds

Modified:
    branches/cmake-bringup/dll/3rdparty/libjpeg/CMakeLists.txt

Modified: branches/cmake-bringup/dll/3rdparty/libjpeg/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/3rdparty/libjpeg/CMakeLists.txt?rev=49793&r1=49792&r2=49793&view=diff
==============================================================================
--- branches/cmake-bringup/dll/3rdparty/libjpeg/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/dll/3rdparty/libjpeg/CMakeLists.txt [iso-8859-1] Thu Nov 25 22:14:07 2010
@@ -61,7 +61,12 @@
 
 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)
 




More information about the Ros-diffs mailing list