Commit graph

102 commits

Author SHA1 Message Date
Campbell Barton
8c6c57f1b4 Enable missing-declarations warning (#643)
Finish ensuring symbols use headers correctly
2016-07-22 13:38:33 +09:00
tomosu
9cb984e84d workaround for missing left button on osx (#561)
* workaround for missing left button on osx

* change Qt path

* change CMake

* transfer filter's pointer to application directly

* rebase

* add final, delete virtual, and beautificate
2016-07-14 19:09:44 +09:00
Campbell Barton
a3a77b1204 CMake: initialize build type (#609)
Avoid using an empty build type.

While supported, it means some settings aren't well defined.
better to default to Release.
2016-07-14 13:44:36 +09:00
Campbell Barton
326eaa5b78 CMake: use STATUS for messages, spaces indentation 2016-07-09 10:44:05 +10:00
Campbell Barton
a9c3dad75a CMake: differentiate system includes (#604) 2016-07-09 00:47:11 +09:00
turtletooth
f8ebe3b803 Merge pull request #575 from shun-iwasawa/pencil_test_viewer
Pencil test feature
2016-07-08 09:00:24 -06:00
Campbell Barton
a0c6e1562d CMake: Test for endian instead of guessing based on the platform (#600) 2016-07-08 20:22:25 +09:00
Campbell Barton
8d53343985 CMake: Conditionally add warnings when supported (#598)
This adds utility functions to conditionally add compiler flags,

allowing warnings from newer compiler versions to be used without
causing a lot of noise for users of older compilers.
2016-07-08 16:23:32 +09:00
shun_iwasawa
21a6b6ba06 pencil test popup 2016-07-06 20:06:20 +09:00
Shinya Kitaoka
c08330d1ae Merge pull request #567 from opentoonz/cmake-cleanup-defines-pr
CMake: use multi-line defines
2016-07-06 13:56:49 +09:00
Shinya Kitaoka
7a5f69a55c Merge pull request #563 from janisozaur/travis
Travis Linux job
2016-07-06 13:36:24 +09:00
Shinya Kitaoka
fd19c4eedf Support Visual Studio 2015 (#544)
* Small changes, for some reason VS 2015 can't link cprintf and they added a second function std::map::count and bind couldn't resolve the function. Substituted with a lambda-expression.

* Created all 64bit version of the 3rd party libs.

* Cleanup popup opens CleanupSettings instead of CleanupSettingsPane. Not finished, panel is wrong now (also uses CleanupSettings).

* Tried to get Twain working, failed.

* When there are more then 3 peg holes create additional holes.

* When a hole touches the boundary it should still be considered a hole.

* Do not compare dot size against fixed size. Will not work in some scan resolutions. Used the same value (PERCENT * max dot size) as later in the code in compare_dots.

* When there are more than three peg holes the code looked for the best fit and used that. The problem was, that the middle hole was used as center for auto center. For three peg holes that is correct, but does not work for more than three. Now the best fit is calculated and from there the offset of the middle of the three best fit holes is calculated and applied.

* One of the last changes broke VS2015 compatibility, it chocked on a missing include.

* fix for msvs2013

* revert autopos.cpp

* apply clang-format

* use GIT-LFS
2016-07-04 17:50:30 +09:00
Campbell Barton
3158be2a42 CMake/Linux: add an install target
This allows for running opentoonz without having to manually write ini files or copy the 'stuff' directory.

By default it installs to `/opt/opentoonz`.
2016-07-03 18:34:50 +10:00
Campbell Barton
f2d492861f CMake: use multi-line defines
Easier to read and avoids merge conflicts
2016-07-02 22:23:18 +10:00
Michał Janiszewski
6dc4b98871 Transparently use lzma, if available in system
It will get picked up by libtiff, so make sure we provide it when
linking libimage
2016-07-01 12:11:51 +02:00
Campbell Barton
2e1cb68b4e CMake: wrap lines for easier reading 2016-06-30 14:37:43 +10:00
Campbell Barton
b45a54792d CMake: write Linux output into bin/
Resolves naming collisions between directories and binaries.
2016-06-30 10:13:38 +10:00
Campbell Barton
89a491484a Misc minor changes needed for building on Linux 2016-06-24 22:01:09 +10:00
Shinya Kitaoka
02d78d2112 fix CMakeLists.txt (#457) 2016-06-17 18:33:04 +09:00
Campbell Barton
22fd3b0447 CMake: changes needed to build on Linux (#452)
Note that these are the main changes from the linux port.
Not a fully working linux port.
2016-06-16 13:52:02 +09:00
Shinya Kitaoka
ee259ffaf7 remove duplicated constants (#296) 2016-06-13 21:37:09 +09:00
Shinya Kitaoka
822411ba0e Support German translation (#363)
German translations

* Added files via upload

First translation draft. Corrections need to be made with actual in hand program

* Added files via upload

* Japanese characters

正方ピクセルを保持 -> Force Squared Pixel translated as "Quadratische Pixel erzwingen"

* Small spelling error

Blur value ->Weichheitsgrad

* add loc/german/*.qm

* modify loc dir names to their local script

* fixup! update loc/*/*.qm

* fix "Sensitivity"
2016-05-27 14:27:54 +09:00
Shinya Kitaoka
12c444ee0d use std::min and std::max (#318) 2016-05-18 13:03:37 +09:00
Shinya Kitaoka
d4642c34e8 Remove macros: CASE, __OR, and DEFAULT (#286)
* remove syntax macros: CASE, __OR, and DEFAULT

* define VC_EXTRALEAN

* remove meaningless comments
2016-05-13 19:49:17 +09:00
Shinya Kitaoka
42c736d27d Merge pull request #260 from ideasman42/cleanup-cmake
CMake: cleanup indentation, remove redundant endif args
2016-05-11 15:25:35 +09:00
Yu Chen
953f29211b Add chinese to build targets 2016-05-10 22:23:42 +08:00
Campbell Barton
f08982dd33 CMake: cleanup indentation, remove redundant endif args 2016-04-27 21:48:12 +10:00
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