aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcrupest <crupest@outlook.com>2023-10-07 17:19:09 +0800
committercrupest <crupest@outlook.com>2023-10-07 17:19:09 +0800
commitae2ae81374792cb78259104b9cbc3e0fef5e6471 (patch)
tree7743b257cfe7544bd190423c56da09a4bb667f79
parent6cd68b1402c568071eebf171bc6904a182f27485 (diff)
downloadcru-ae2ae81374792cb78259104b9cbc3e0fef5e6471.tar.gz
cru-ae2ae81374792cb78259104b9cbc3e0fef5e6471.tar.bz2
cru-ae2ae81374792cb78259104b9cbc3e0fef5e6471.zip
Drop cairo for web.
-rw-r--r--lib/meson-projects/meson.build2
-rw-r--r--lib/meson-projects/subprojects/.gitignore1
-rw-r--r--lib/meson-projects/subprojects/glib.wrap11
-rw-r--r--src/platform/CMakeLists.txt2
4 files changed, 1 insertions, 15 deletions
diff --git a/lib/meson-projects/meson.build b/lib/meson-projects/meson.build
index 0434dfb0..5efa46af 100644
--- a/lib/meson-projects/meson.build
+++ b/lib/meson-projects/meson.build
@@ -17,12 +17,10 @@ if hello_world_result.returncode() != 0
endif
if get_option('cairo').enabled()
- subproject('glib')
subproject('cairo')
endif
if get_option('pango').enabled()
- subproject('glib')
subproject('pango')
endif
diff --git a/lib/meson-projects/subprojects/.gitignore b/lib/meson-projects/subprojects/.gitignore
index 69b705eb..a268818f 100644
--- a/lib/meson-projects/subprojects/.gitignore
+++ b/lib/meson-projects/subprojects/.gitignore
@@ -1,6 +1,5 @@
*
!.gitignore
!cairo.wrap
-!glib.wrap
!pango.wrap
diff --git a/lib/meson-projects/subprojects/glib.wrap b/lib/meson-projects/subprojects/glib.wrap
deleted file mode 100644
index bf287a7d..00000000
--- a/lib/meson-projects/subprojects/glib.wrap
+++ /dev/null
@@ -1,11 +0,0 @@
-[wrap-git]
-directory = glib
-url = https://gitlab.gnome.org/GNOME/glib.git
-push-url = ssh://git@ssh.gitlab.gnome.org:GNOME/glib.git
-revision = main
-depth = 1
-
-[provide]
-dependency_names = gthread-2.0, gobject-2.0, gmodule-no-export-2.0, gmodule-export-2.0, gmodule-2.0, glib-2.0, gio-2.0, gio-windows-2.0, gio-unix-2.0
-program_names = glib-genmarshal, glib-mkenums, glib-compile-schemas, glib-compile-resources, gio-querymodules, gdbus-codegen
-
diff --git a/src/platform/CMakeLists.txt b/src/platform/CMakeLists.txt
index c1b08c2f..3f85adbc 100644
--- a/src/platform/CMakeLists.txt
+++ b/src/platform/CMakeLists.txt
@@ -20,7 +20,7 @@ elseif (APPLE)
add_subdirectory(gui/osx)
elseif (EMSCRIPTEN)
add_subdirectory(web)
- add_subdirectory(graphics/cairo)
+ # add_subdirectory(graphics/cairo)
add_subdirectory(graphics/web_canvas)
endif()