diff options
| author | Thomas Dinges <blender@dingto.org> | 2013-08-31 06:56:03 +0400 |
|---|---|---|
| committer | Thomas Dinges <blender@dingto.org> | 2013-08-31 06:56:03 +0400 |
| commit | 8f699dbd5e2bafa926f0e716a00c28022308adab (patch) | |
| tree | c1b8f2d4574d45008d6e348c8b2cc9b656115cca /intern/cycles/app | |
| parent | 615894323a58306afab1a70d4704611e96144499 (diff) | |
Cycles:
* More build fixes, 2 link errors remain. http://www.pasteall.org/45279
Note: Probably those paths should only be added for Windows and Linux, as "OPENIMAGEIO_LIBPATH" already inherit them for Mac OS. Also "OPENIMAGEIO_LIBRARIES" inherits the libs for Linux already. Is that intended or a lack of consistency?
Diffstat (limited to 'intern/cycles/app')
| -rw-r--r-- | intern/cycles/app/CMakeLists.txt | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/intern/cycles/app/CMakeLists.txt b/intern/cycles/app/CMakeLists.txt index 2028622377f..a2142d77a9e 100644 --- a/intern/cycles/app/CMakeLists.txt +++ b/intern/cycles/app/CMakeLists.txt @@ -24,13 +24,17 @@ set(LIBRARIES ${OPENGL_LIBRARIES} ${CYCLES_GLEW_LIBRARY} ${OPENIMAGEIO_LIBRARIES} + ${PNG_LIBRARIES} + ${JPEG_LIBRARIES} + ${ZLIB_LIBRARIES} + ${TIFF_LIBRARY} ) if(WIN32) list(APPEND LIBRARIES ${PTHREADS_LIBRARIES}) endif() -link_directories(${OPENIMAGEIO_LIBPATH} ${BOOST_LIBPATH}) +link_directories(${OPENIMAGEIO_LIBPATH} ${BOOST_LIBPATH} ${PNG_LIBPATH} ${JPEG_LIBPATH} ${ZLIB_LIBPATH} ${TIFF_LIBPATH}) if(WITH_CYCLES_STANDALONE AND WITH_CYCLES_STANDALONE_GUI) list(APPEND LIBRARIES ${GLUT_LIBRARIES}) |