Commit graph

25 commits

Author SHA1 Message Date
Shinya Kitaoka
7db469349f fix CMakeLists.txt 2016-04-22 17:51:35 +09:00
Shinya Kitaoka
2a1f2beb19 support a QT_PATH var for MacOS 2016-04-22 17:34:36 +09:00
Shinya Kitaoka
aa590765e0 keep codes for QTBUG-48288 2016-04-22 16:19:06 +09:00
Shinya Kitaoka
d75b42a25e Merge branch 'qt56' of https://github.com/ss23/opentoonz into test/pr/179 2016-04-22 15:52:56 +09:00
Shinya Kitaoka
11d3d7de92 Merge branch 'boost_upgrade' of https://github.com/ss23/opentoonz into ss23-boost_upgrade 2016-04-21 17:52:04 +09:00
tomosu
b8c01c142e Merge pull request #190 from skitaoka/fix/delete-deletes
Remove `delete`s with some refactoring
2016-04-20 14:25:50 +09:00
Shinya Kitaoka
c12eacf2f3 remove #define NOMINMAX 2016-04-20 10:24:50 +09:00
Keisuke Ogaki
1a50d4d9ff fix bug: lzodriver should be bundled 2016-04-19 22:51:34 +09:00
Shinya Kitaoka
69d9a8c3bb add spanish to build targets 2016-04-18 18:34:30 +09:00
Stephen Shkardoon
3d9be09db0 Upgrade to Qt5.6
Fix #109 #138 #165 #178.
Fixes multiple issues on Windows 10.
2016-04-15 10:35:49 +12:00
Stephen Shkardoon
e239ec6928 Allow building with a newer version of Boost (up to 1.60.0).
The instructions for both OSX and Windows still say to use 1.55.0,
but cmake will allow up to 1.60.0.
Using a later version will also mean the additional patch for VS2013
is not required.
2016-04-15 05:42:58 +12:00
Shinya Kitaoka
8c5f687a8c Merge pull request #117 from jpumc/patch-oos-build-1
Fix CMAKE_MODULE_PATH for out-of-source build
2016-04-13 14:14:56 +09:00
Keisuke Ogaki
b22d0cfb59 Add libpng include path search 2016-04-08 00:17:03 +09:00
jpumc
a8cd98dd0c Fix CMAKE_MODULE_PATH for out-of-source build 2016-03-31 17:09:25 +03:00
Michael Cullen
b49802832b Fix build when libtiff exists on system
On OSX at least, if you have libtiff in your system include path,
it will use that instead of the bundled modified version even if
FindTIFF.cmake locates the correct version. This commit fixes that
by making sure the libtiff include directory is before the system
include paths.
2016-03-28 14:50:54 +01:00
Toshihiro Shimizu
5dddbf3dad Merge pull request #24 from opentoonz/suppress-warning-C4819
Suppress warning C4819 in Visual Studio 2013
2016-03-25 19:40:52 +09:00
roentgen
f09e094840 Merge pull request #30 from opentoonz/fix-lzodriver
we always have thirdparty/lzo/driver. osx build never uses thirdpary/…
2016-03-25 18:55:07 +09:00
roentgen
3047bb2598 we always have thirdparty/lzo/driver. osx build never uses thirdpary/lzo/lzo-2.09 (was removed) 2016-03-25 18:42:18 +09:00
kusano
543ae709dc Suppress warning C4819 in Visual Studio 2013
"The file contains a character that cannot be represented in the current code page"
2016-03-24 20:30:47 +09:00
kusano
8977366225 Remove zlib 1.2.7 2016-03-24 19:57:01 +09:00
kusano
3f512259eb Update CMakeLists.txt for Visual Studio
- add libpng
- change libtiff path
2016-03-24 04:03:50 +09:00
fukasawa
e60969f67f moved to libpng and libtiff to thirdparty 2016-03-24 00:50:22 +09:00
roentgen
b75cab9b67 added tiff-4.0.4 2016-03-23 04:20:01 +09:00
roentgen
19af1bad04 use cmake modules for superlu and lzo.
use pkg-config for usb, glew and lz4(not static).
(WIP) fixed getting kinda hack for tiff out to libtiff
2016-03-23 03:48:01 +09:00
Toshihiro Shimizu
890dddabbd first commit 2016-03-19 02:57:51 +09:00