projects
/
reactos.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(from parent 1:
a68d9fb
)
[CMAKE]
author
Timo Kreuzer
<timo.kreuzer@reactos.org>
Thu, 25 Nov 2010 22:14:07 +0000
(22:14 +0000)
committer
Timo Kreuzer
<timo.kreuzer@reactos.org>
Thu, 25 Nov 2010 22:14:07 +0000
(22:14 +0000)
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
patch
|
blob
|
history
diff --git
a/dll/3rdparty/libjpeg/CMakeLists.txt
b/dll/3rdparty/libjpeg/CMakeLists.txt
index
1c78830
..
f9bb553
100644
(file)
--- 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)