[gimp/meson: 102/128] Fix app/console builds.
- From: Félix Piédallu <fpiedallu src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp/meson: 102/128] Fix app/console builds.
- Date: Mon, 12 Feb 2018 13:48:23 +0000 (UTC)
commit f94ab3b113de49152e95c09b583c6372e045d367
Author: Félix Piédallu <felix piedallu me>
Date: Thu Jan 11 11:01:26 2018 +0100
Fix app/console builds.
app/meson.build | 28 +++++++++++++++-------------
1 files changed, 15 insertions(+), 13 deletions(-)
---
diff --git a/app/meson.build b/app/meson.build
index f0b2b97..551314e 100644
--- a/app/meson.build
+++ b/app/meson.build
@@ -116,29 +116,19 @@ subdir('tests')
app_links = [
- libapp,
- libappactions,
libappconfig,
libappcore,
- libappdialogs,
- libappdialogs,
- libappdisplay,
libappfile,
libappgegl,
- libappgui,
libappinternalprocs,
libapplayermodes,
libapplayermodeslegacy,
- libappmenus,
libappoperations,
libapppaint,
libapppdb,
libappplugin,
- libapppropgui,
libapptext,
- libapptools,
libappvectors,
- libappwidgets,
libappxcf,
libgimpbase,
libgimpcolor,
@@ -146,8 +136,20 @@ app_links = [
libgimpmath,
libgimpmodule,
libgimpthumb,
+]
+
+app_gui_links = [
+ libappactions,
+ libappdialogs,
+ libappdisplay,
+ libappgui,
+ libappmenus,
+ libapppropgui,
+ libapptools,
+ libappwidgets,
libgimpwidgets,
]
+
app_deps = [
gio, gtk2, pangocairo, gegl, lcms, gexiv2,
]
@@ -155,7 +157,7 @@ app_deps = [
# Executables
gimpconsole_exe = executable('gimp-console-'+app_version,
- 'main.c',
+ libapp_sources + [ 'main.c' ],
c_args: app_cflags + [ '-DGIMP_CONSOLE_COMPILATION', ],
include_directories: [ rootInclude, ],
dependencies: app_deps,
@@ -164,10 +166,10 @@ gimpconsole_exe = executable('gimp-console-'+app_version,
)
gimpmain_exe = executable('gimp-'+app_version,
- 'main.c',
+ libapp_sources + [ 'main.c' ],
c_args: app_cflags + [ ],
include_directories: [ rootInclude, ],
dependencies: app_deps,
- link_with: app_links,
+ link_with: app_links + app_gui_links,
install: true,
)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]