diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000..70a49d1 --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,3 @@ +{ + "cmake.sourceDirectory": "${workspaceFolder}/toonz/sources" +} \ No newline at end of file diff --git a/doc/how_to_build_macosx.md b/doc/how_to_build_macosx.md index b383662..a47d04e 100644 --- a/doc/how_to_build_macosx.md +++ b/doc/how_to_build_macosx.md @@ -63,6 +63,14 @@ $ cd ../tiff-4.0.3 $ ./configure && make ``` +If you install libtiff through brew before, linker tool couses fail. In order to solve this problem use install_name_tool. +``` +$ cd opentoonz/thirdparty/tiff-4.0.3/libtiff/.libs/ +$ install_name_tool -id $PWD/libtiff.5.dylib libtiff.5.dylib + +``` + + If you downloaded and installed boost from https://boost.org instead of homebrew, move the package under `thirdparty/boost` as follows: ``` $ cd thirdparty/boost diff --git a/toonz/cmake/FindTIFF.cmake b/toonz/cmake/FindTIFF.cmake index b3db5fa..700b3e8 100644 --- a/toonz/cmake/FindTIFF.cmake +++ b/toonz/cmake/FindTIFF.cmake @@ -19,14 +19,15 @@ endif() find_library( TIFF_LIBRARY NAMES - libtiff.a + # libtiff.a + # use shared library instead of static + libtiff.dylib HINTS ${SDKROOT} PATH_SUFFIXES tiff-4.0.3/libtiff/.libs NO_DEFAULT_PATH ) - message("***** libtiff Header path:" ${TIFF_INCLUDE_DIR}) message("***** libtiff Library path:" ${TIFF_LIBRARY}) @@ -43,4 +44,4 @@ endif() mark_as_advanced( TIFF_LIBRARY TIFF_INCLUDE_DIR -) +) \ No newline at end of file