aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrancesco Abbate <francesco.bbt@gmail.com>2020-06-30 17:02:50 +0200
committerFrancesco Abbate <francesco.bbt@gmail.com>2020-06-30 17:02:50 +0200
commit71db2d439aec673c8aa9fcbf5550ddab4c49b2bd (patch)
treeaca7f7d0024a85be0d2500019287a1edc8cb5a39
parenta292793143e6a206798dd1a50a78397aa8c0fe86 (diff)
downloadlite-xl-71db2d439aec673c8aa9fcbf5550ddab4c49b2bd.tar.gz
lite-xl-71db2d439aec673c8aa9fcbf5550ddab4c49b2bd.zip
Add libagg as a subproject
No longer required to be installed, the subproject will be used if not found.
-rw-r--r--.gitignore3
-rw-r--r--lib/font_renderer/meson.build7
-rw-r--r--subprojects/libagg.wrap4
3 files changed, 12 insertions, 2 deletions
diff --git a/.gitignore b/.gitignore
index cf6be389..59cabbb5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
.build*
-
+subprojects/libagg
+sybprojects/lua
diff --git a/lib/font_renderer/meson.build b/lib/font_renderer/meson.build
index e858f064..7724d584 100644
--- a/lib/font_renderer/meson.build
+++ b/lib/font_renderer/meson.build
@@ -1,6 +1,11 @@
-libagg_dep = dependency('libagg')
freetype_dep = dependency('freetype2')
+libagg_dep = dependency('libagg', required: false)
+if not libagg_dep.found()
+ libagg_subproject = subproject('libagg')
+ libagg_dep = libagg_subproject.get_variable('libagg_dep')
+endif
+
font_renderer_sources = [
'agg_font_freetype.cpp',
'font_renderer.cpp',
diff --git a/subprojects/libagg.wrap b/subprojects/libagg.wrap
new file mode 100644
index 00000000..76eadfe4
--- /dev/null
+++ b/subprojects/libagg.wrap
@@ -0,0 +1,4 @@
+[wrap-git]
+directory = libagg
+url = https://github.com/franko/agg
+revision = v2.4-lhelper2