razzaline/tahoma2d
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity

Merge pull request #135 from kogaki/fix/osx_build

Browse source 
fix OSX build
This commit is contained in:
Shinya Kitaoka 2016-04-13 14:34:48 +09:00
commit 02faf221f5
2 changed files with 24 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
doc/how_to_build_macosx.md
View file

@ -1,3 +1,4 @@
# Setting Up the Development Environment on MacOSX # Setting Up the Development Environment on MacOSX
## Necessary Software ## Necessary Software
@ -15,19 +16,26 @@
## Building on MacOSX ## 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 $ 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: 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 $ 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 $ cd opentoonz/thirdparty/tiff-4.0.3
$ ./configure && make $ ./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`. 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 $ tar xjvf boost_1_55_0.tar.bz2
``` ```
### Building Everything Together ### 5. Build Everything Together
``` ```
$ cd ../../toonz $ cd ../../toonz
$ mkdir build $ mkdir build
$ cd build $ cd build
$ cmake ../sources CMAKE_PREFIX_PATH=~/Qt5.5.1/5.5/clang_64 cmake ../sources
$ make $ make
``` ```

11
thirdparty/lzo/driver/CMakeLists.txt vendored
View file

@ -14,6 +14,11 @@ endif ()
include_directories(${LZO_PATH} ${LZO_PATH}/include) include_directories(${LZO_PATH} ${LZO_PATH}/include)
add_definitions(-DLZO_USE_ASM) add_definitions(-DLZO_USE_ASM)
add_executable(lzocompress lzocompress.c) add_executable(lzocompress lzocompress.c)
target_link_libraries(lzocompress lzo2${PREFIX} ${LZO_LIBRARY}) add_executable(lzodecompress lzodecompress.c)
add_executable(lzodecompress lzodecompress.c) if (WIN32)
target_link_libraries(lzodecompress lzo2${PREFIX} ${LZO_LIBRARY}) 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()