Commit Graph

131 Commits

Author SHA1 Message Date
David Capello
46e9ece20a Update freetype2 library 2016-06-08 13:04:58 -03:00
David Capello
98ba8df343 Update libpng library 2016-05-04 12:43:41 -03:00
David Capello
231b17615a Merge branch 'cmake-optima' of https://github.com/winterheart/aseprite into cmake-optima 2016-04-19 14:19:21 -03:00
David Capello
ba234aea87 Update libpng 2016-04-19 14:10:53 -03:00
David Capello
756f7173e1 Don't use OpenSSL to compile curl 2016-04-19 14:09:38 -03:00
Azamat H. Hackimov
b5f63d428c Refactoring CMake invocations
Using built-in function and modules for checking.
2016-04-19 20:56:04 +05:00
David Capello
21921fdfd5 Refactor scripting code 2016-04-06 15:37:13 -03:00
David Capello
d94b859777 Try to compile libpng before freetype (because freetype depends on libpng) 2016-04-04 12:24:40 -03:00
David Capello
8028cf64db Merge branch 'unicode-text'
# Conflicts:
#	third_party/libpng
#	third_party/zlib
2016-04-04 10:26:57 -03:00
David Capello
fdbb70b1a4 Disable zlib tests 2016-04-01 09:50:09 -03:00
David Capello
72b47e061a Disable png tests and dynamic library caching values 2016-04-01 09:17:40 -03:00
David Capello
58daa23240 Replace zlib and libpng with submodules 2016-03-31 17:48:54 -03:00
David Capello
779875e728 Remove unused pixman-version.h.cmake file 2016-03-14 15:49:31 -03:00
David Capello
64deb6ed87 Remove mongoose code
The webserver isn't functional yet, and mongoose license is GPL now.
2016-02-16 18:52:15 -03:00
David Capello
84781196e5 Update simpleini version 2016-01-04 12:37:48 -03:00
David Capello
3087ddd5b9 Update pixman to 0.33.6 2016-01-04 12:27:25 -03:00
David Capello
d77aabd3f3 Update freetype2 version
Should fix #909 and #930
2016-01-04 12:19:19 -03:00
David Capello
26e4678d2d Add functions to encode/decode data in base64 2015-12-21 13:44:02 -03:00
David Capello
b3bb3c077e Update freetype2 submodule
Our change was merged upstream, so now we can use the official master
branch.
2015-10-29 09:16:46 -03:00
David Capello
fc8f12f11c Fix freetype2 library compilation with Ninja makefiles 2015-09-22 19:29:27 -03:00
David Capello
ce96a77aae Add required flags to link the application with freetype2 library 2015-09-22 19:27:44 -03:00
David Capello
9b43aa11b3 Add freetype2 submodule 2015-09-22 19:27:04 -03:00
David Capello
4939a716a3 Remove freetype code 2015-09-22 19:24:36 -03:00
David Capello
2a0f8ca536 Disable webp support by default (related to #799)
There is a new WITH_WEBP_SUPPORT cmake option to enable webp support.
2015-09-07 14:45:31 -03:00
Gabriel Rauter
884b5f2e6f add submodule libwebp for #273 2015-09-01 13:04:11 +02:00
David Capello
55f90d8b8b Add target_link_libraries() for sublibraries
With this change we remove some internal variables/lists like sys_libs,
libs3rdparty, etc. And we fix dependencies problems between targets.
2015-07-13 12:16:55 -03:00
David Capello
66330dc39a Remove unused libart library source code 2015-06-23 12:45:05 -03:00
David Capello
5b17f44526 Add basic scripting support to eval expression in --shell and DevConsole 2015-06-19 20:01:30 -03:00
David Capello
699d60b03f Change scripting engine from V8 to duktape 2015-06-19 13:06:47 -03:00
David Capello
be0f0892e2 Remove special flags to compile loadpng
These flags are defined in the main CMakeLists.txt file if they are needed.
2015-06-09 10:47:14 -03:00
David Capello
222562db09 Remove USE_SHARED_GTEST option 2015-06-08 18:20:39 -03:00
David Capello
b3b6a28427 Now include(CheckCXXSourceCompiles) is required in src/CMakeLists.txt 2015-06-08 17:46:37 -03:00
David Capello
0c115e5567 Move code to find gtest shared version into src/CMakeLists.txt 2015-06-08 17:42:08 -03:00
David Capello
fdeba03216 Fix find_library() call for gtest library (issue #695) 2015-06-08 17:29:42 -03:00
David Capello
fd15b4be97 Update third_party/README.md 2015-05-29 11:54:37 -03:00
David Capello
72d0ca8d2c Don't define strlcat() in curl if HAVE_STRLCAT is defined 2015-05-29 11:40:51 -03:00
David Capello
283f9984bf Add adjustments to third_party/CMakeLists.txt for the new gtest submodule 2015-05-29 11:26:56 -03:00
David Capello
fd445e01f9 Add third_party/gtest as a submodule 2015-05-29 11:08:47 -03:00
David Capello
f3cfa547d4 Remove third_party/gtest files 2015-05-29 11:07:33 -03:00
David Capello
c21a84c9c9 Add zlib as libpng dependency 2015-05-19 14:02:52 -03:00
David Capello
d7bf504887 Fix flags to always compile with libcurl (as HomeView needs net-lib to load news) 2015-04-23 19:14:13 -03:00
David Capello
0350ac4bbe Initial work on Skia backend (WIP) 2015-03-16 15:05:13 -03:00
David Capello
2c408e4c98 Fix linking with libcurl from a Visual Studio solution (again, fix #606) 2015-03-10 13:50:12 -03:00
David Capello
b23194dfae Fix several warnings in MSVC, clang, and gcc 2015-03-05 15:19:00 -03:00
David Capello
5aea29348e Merge branch '1.0'
Conflicts:
	data/gui.xml
	src/app/CMakeLists.txt
	src/app/color_utils.cpp
	src/app/color_utils.h
	src/app/commands/cmd_preview.cpp
	src/app/document_exporter.cpp
	src/app/document_exporter.h
	src/app/ui/editor/standby_state.cpp
	src/config.h
	src/main/resources_win32.rc
2014-12-03 11:15:09 -03:00
David Capello
7c9303e91d Fix compilation of libcurl from a Visual Studio solution 2014-12-02 01:42:11 -03:00
David Capello
39b8e034b5 Merge branch '1.0'
Conflicts:
	.gitmodules
	CMakeLists.txt
	src/CMakeLists.txt
	src/app/app.h
	src/app/app_menus.cpp
	src/app/commands/cmd_move_mask.cpp
	src/app/commands/cmd_rotate.cpp
	src/app/modules/gui.cpp
	src/doc/resize_image_tests.cpp
	src/ui/accelerator.cpp
	third_party/CMakeLists.txt
2014-10-30 01:06:27 -03:00
David Capello
fa1d9de578 Add TLS support to pixman for Unix-like systems 2014-10-25 22:36:26 -03:00
David Capello
0cf597c0f4 Add dependency with pixman library 2014-10-25 22:22:58 -03:00
David Capello
2b2d0f34b2 Add simpleini to replace Allegro 4 configuration routines 2014-10-16 21:27:25 -03:00