diff --git a/doc/how_to_build_macosx.md b/doc/how_to_build_macosx.md index 80e5a69..33268e7 100644 --- a/doc/how_to_build_macosx.md +++ b/doc/how_to_build_macosx.md @@ -9,21 +9,21 @@ - cmake - Version 3.2.2 confirmed to work. - Qt - - http://download.qt.io/official_releases/qt/5.6/5.6.0/ - - qt-opensource-mac-x64-clang-5.6.0.dmg + - http://download.qt.io/official_releases/qt/5.6/5.6.2/ + - qt-opensource-mac-x64-clang-5.6.2.dmg - boost - http://www.boost.org/users/history/version_1_55_0.html (or later, though only 1.55.0 is supported) ## Building on MacOSX -### 0. Install Qt +### 0. Install Qt 5.6 (Most recent is 5.6.2) ### 1. Install Dependent Packages With homebrew, you can install them with following command. ``` -$ brew install glew lz4 libjpeg libpng lzo pkg-config libusb +$ brew install glew lz4 libjpeg libpng lzo pkg-config libusb cmake git-lfs libmypaint ``` Or, you should build and install them manually. @@ -33,6 +33,8 @@ Or, you should build and install them manually. ``` $ git clone https://github.com/opentoonz/opentoonz +cd opentoonz +git lfs pull ``` ### (Optional) Create the stuff Directory @@ -40,13 +42,13 @@ $ git clone https://github.com/opentoonz/opentoonz If the directory `/Applications/OpenToonz/OpenToonz_1.1_stuff` does not exist, enter the following command: ``` -$ sudo cp -r opentoonz/stuff /Applications/OpenToonz/OpenToonz_1.1_stuff +$ sudo cp -r stuff /Applications/OpenToonz/OpenToonz_1.1_stuff ``` ### 3. Build tiff in thirdparty ``` -$ cd opentoonz/thirdparty/tiff-4.0.3 +$ cd thirdparty/tiff-4.0.3 $ ./configure && make ``` @@ -59,13 +61,23 @@ $ mv ~/Downloads/boost_1_55_0.tar.bz2 . $ tar xjvf boost_1_55_0.tar.bz2 ``` -### 5. Build Everything Together +### 5. Update the path to your Qt 5.6 install in opentoonz/toonz/sources/CMakeLists.txt line 160 or 172 +If using Qt 5.6.2, this is unnecessary. + +### 6. Copy the lzo header folder to the lzo driver directory + +``` +$ cd ../lzo +$ cp -r 2.03/include/lzo driver +``` + +### 6. Build Everything Together ``` $ cd ../../toonz $ mkdir build $ cd build - CMAKE_PREFIX_PATH=~/Qt5.6.0/5.6/clang_64 cmake ../sources + CMAKE_PREFIX_PATH=~/Qt5.6.2/5.6/clang_64 cmake ../sources $ make ``` diff --git a/toonz/cmake/FindTIFF.cmake b/toonz/cmake/FindTIFF.cmake index ee75f0c..b3db5fa 100644 --- a/toonz/cmake/FindTIFF.cmake +++ b/toonz/cmake/FindTIFF.cmake @@ -7,6 +7,13 @@ find_path( ${SDKROOT} PATH_SUFFIXES tiff-4.0.3/libtiff/ +# if mono or another framework with a tif library +# is installed, ignore it. +if(BUILD_ENV_APPLE) + NO_DEFAULT_PATH + NO_CMAKE_ENVIRONMENTPATH + NO_CMAKE_PATH +endif() ) find_library( diff --git a/toonz/sources/CMakeLists.txt b/toonz/sources/CMakeLists.txt index 82fe6c0..e8e3ebd 100644 --- a/toonz/sources/CMakeLists.txt +++ b/toonz/sources/CMakeLists.txt @@ -157,7 +157,7 @@ elseif(BUILD_ENV_APPLE) endif() message("PLATFORM:" ${PLATFORM}) if(PLATFORM EQUAL 64) - set(QT_PATH "~/Qt/5.6/clang_64/lib" CACHE PATH "Qt instlattion directory") + set(QT_PATH "~/Qt5.6.2/5.6/clang_64/lib" CACHE PATH "Qt instlattion directory") set(QT_LIB_PATH "${QT_PATH}/") set(CMAKE_PREFIX_PATH "${QT_LIB_PATH}cmake/") @@ -169,7 +169,7 @@ elseif(BUILD_ENV_APPLE) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m64 -std=c++11 -stdlib=libc++ -fno-implicit-templates") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -m64") elseif(PLATFORM EQUAL 32) - set(QT_PATH "~/Qt/5.6/clang_32/lib" CACHE PATH "Qt instlattion directory") + set(QT_PATH "~/Qt5.6.2/5.6/clang_32/lib" CACHE PATH "Qt instlattion directory") set(QT_LIB_PATH "${QT_PATH}/") set(CMAKE_PREFIX_PATH "${QT_LIB_PATH}cmake/")