From 3f512259eb8332e349b951fdf5012b67c811756b Mon Sep 17 00:00:00 2001 From: kusano Date: Mar 23 2016 19:03:50 +0000 Subject: Update CMakeLists.txt for Visual Studio - add libpng - change libtiff path --- diff --git a/toonz/sources/CMakeLists.txt b/toonz/sources/CMakeLists.txt index ecf5e9b..74c956d 100644 --- a/toonz/sources/CMakeLists.txt +++ b/toonz/sources/CMakeLists.txt @@ -121,9 +121,13 @@ if(WIN32) optimized ${SDKROOT}/zlib/zlib-1.2.7/lib/zlib-1.2.7${PLATFORM2}.lib debug ${SDKROOT}/zlib/zlib-1.2.7/lib/zlib-1.2.7${PLATFORM2}d.lib) set(JPEG_LIB ${SDKROOT}/LibJPEG/jpeg-9/lib/LibJPEG-9${PLATFORM2}.lib) + set(TIFF_INCLUDE_DIR ${SDKROOT}/tiff-4.0.3/libtiff) set(TIFF_LIB - optimized ${SDKROOT}/LibTIFF/tiff-4.0.3/lib/LibTIFF-4.0.3${PLATFORM2}.lib - debug ${SDKROOT}/LibTIFF/tiff-4.0.3/lib/LibTIFF-4.0.3${PLATFORM2}d.lib) + optimized ${SDKROOT}/tiff-4.0.3/lib/LibTIFF-4.0.3${PLATFORM2}.lib + debug ${SDKROOT}/tiff-4.0.3/lib/LibTIFF-4.0.3${PLATFORM2}d.lib) + set(PNG_LIB + optimized ${SDKROOT}/libpng-1.6.21/lib/libpng16${PLATFORM2}.lib + debug ${SDKROOT}/libpng-1.6.21/lib/libpng16${PLATFORM2}d.lib) set(GLEW_LIB ${SDKROOT}/glew/glew-1.9.0/lib/glew${PLATFORM}.lib) set(LZ4_LIB ${SDKROOT}/Lz4/Lz4_131/lz4_${PLATFORM}.lib) set(SUPERLU_LIB ${SDKROOT}/superlu/SuperLU_${PLATFORM}.lib) diff --git a/toonz/sources/image/CMakeLists.txt b/toonz/sources/image/CMakeLists.txt index de89e01..e9c1647 100644 --- a/toonz/sources/image/CMakeLists.txt +++ b/toonz/sources/image/CMakeLists.txt @@ -78,7 +78,7 @@ message("Bin: " ${CMAKE_CURRENT_BINARY_DIR}) include_directories( ${TIFF_INCLUDE_DIR} ${SDKROOT}/LibJPEG/jpeg-9 - ${SDKROOT}/LibTIFF/tiff-4.0.3/libtiff) + ${SDKROOT}/libpng-1.6.21) if (WIN32) if(PLATFORM EQUAL 32) include_directories(${SDKROOT}/quicktime/QT73SDK/CIncludes) @@ -111,4 +111,4 @@ else() ${QD_LIB}) endif() -target_link_libraries(image Qt5::Core Qt5::Network ${Z_LIB} ${GLUT_LIB} ${GL_LIB} ${JPEG_LIB} ${TIFF_LIBRARY} ${PNG_LIB} ${EXTRA_LIBS}) +target_link_libraries(image Qt5::Core Qt5::Network ${Z_LIB} ${GLUT_LIB} ${GL_LIB} ${JPEG_LIB} ${TIFF_LIB} ${PNG_LIB} ${EXTRA_LIBS})