From 9cb85ebe6052a07cfba280313c2db036871f6160 Mon Sep 17 00:00:00 2001
From: Keisuke Ogaki <keisuke_ogaki@dwango.co.jp>
Date: Mon, 4 Apr 2016 18:24:34 +0900
Subject: [PATCH] fix OSX build

---
 doc/how_to_build_macosx.md           | 24 ++++++++++++++++--------
 thirdparty/lzo/driver/CMakeLists.txt | 11 ++++++++---
 2 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/doc/how_to_build_macosx.md b/doc/how_to_build_macosx.md
index 6e943217..68532df4 100644
--- a/doc/how_to_build_macosx.md
+++ b/doc/how_to_build_macosx.md
@@ -1,3 +1,4 @@
+
 # Setting Up the Development Environment on MacOSX
 
 ## Necessary Software
@@ -15,19 +16,26 @@
 
 ## Building on MacOSX
 
-### Using brew to Install Necessary Packages
+### 0. Install Qt
+
+### 1. Install Dependent Packages
+
+With homebrew, you can install them with following command.
 
 ```
-$ brew install glew lz4 libjpeg libpng lzo pkg-config
+$ brew install glew lz4 libjpeg libpng lzo pkg-config libusb
 ```
 
-### Cloning the Repository
+Or, you should build and install them manually.
+
+
+### 2. Clone the Repository
 
 ```
 $ git clone https://github.com/opentoonz/opentoonz
 ```
 
-### (Optional) Creating the stuff Directory
+### (Optional) Create the stuff Directory
 
 If the directory `/Applications/OpenToonz/OpenToonz_1.0_stuff` does not exist, enter the following command:
 
@@ -35,14 +43,14 @@ If the directory `/Applications/OpenToonz/OpenToonz_1.0_stuff` does not exist, e
 $ sudo cp -r opentoonz/stuff /Applications/OpenToonz/OpenToonz_1.0_stuff
 ```
 
-### Building tiff in thirdparty
+### 3. Build tiff in thirdparty
 
 ```
 $ cd opentoonz/thirdparty/tiff-4.0.3
 $ ./configure && make
 ```
 
-### Installing boost to thirdpaty
+### 4. Put Boost library into thirdpaty directory
 The following assumes `boost_1_55_0.tar.bz2` was downloaded to `~/Downloads`.
 
 ```
@@ -51,13 +59,13 @@ $ mv ~/Downloads/boost_1_55_0.tar.bz2 .
 $ tar xjvf boost_1_55_0.tar.bz2
 ```
 
-### Building Everything Together
+### 5. Build Everything Together
 
 ```
 $ cd ../../toonz
 $ mkdir build
 $ cd build
-$ cmake ../sources
+  CMAKE_PREFIX_PATH=~/Qt5.5.1/5.5/clang_64 cmake ../sources
 $ make
 ```
 
diff --git a/thirdparty/lzo/driver/CMakeLists.txt b/thirdparty/lzo/driver/CMakeLists.txt
index 040d00c5..df9a7584 100644
--- a/thirdparty/lzo/driver/CMakeLists.txt
+++ b/thirdparty/lzo/driver/CMakeLists.txt
@@ -14,6 +14,11 @@ endif ()
 include_directories(${LZO_PATH} ${LZO_PATH}/include)
 add_definitions(-DLZO_USE_ASM)
 add_executable(lzocompress  lzocompress.c)
-target_link_libraries(lzocompress lzo2${PREFIX} ${LZO_LIBRARY})
-add_executable(lzodecompress  lzodecompress.c)
-target_link_libraries(lzodecompress lzo2${PREFIX} ${LZO_LIBRARY})
+add_executable(lzodecompress lzodecompress.c)
+if (WIN32)
+	target_link_libraries(lzocompress lzo2${PREFIX} ${LZO_LIBRARY})
+	target_link_libraries(lzodecompress lzo2${PREFIX} ${LZO_LIBRARY})
+else ()
+	target_link_libraries(lzocompress ${LZO_LIBRARY})
+	target_link_libraries(lzodecompress ${LZO_LIBRARY})
+endif()