[gimp/meson: 6/127] Added some in app.
- From: Félix Piédallu <fpiedallu src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp/meson: 6/127] Added some in app.
- Date: Fri, 2 Feb 2018 16:00:15 +0000 (UTC)
commit b5a57a8facf781fc83282d54a9c41608e189fc92
Author: Félix Piédallu <felix piedallu me>
Date: Tue Nov 7 18:08:28 2017 +0100
Added some in app.
app/actions/meson.build | 107 +++++++++++++++++++++++
app/config/meson.build | 57 ++++++++++++
app/core/meson.build | 217 +++++++++++++++++++++++++++++++++++++++++++++++
app/meson.build | 12 +++
app/xcf/meson.build | 19 ++++
meson.build | 11 ++-
modules/meson.build | 118 +++++++++++++++++++++++++
tools/meson.build | 70 +++++++++++++++
8 files changed, 608 insertions(+), 3 deletions(-)
---
diff --git a/app/actions/meson.build b/app/actions/meson.build
new file mode 100644
index 0000000..bcf230c
--- /dev/null
+++ b/app/actions/meson.build
@@ -0,0 +1,107 @@
+libappactions_sources = [
+ 'actions.c',
+ 'brush-editor-actions.c',
+ 'brushes-actions.c',
+ 'buffers-actions.c',
+ 'buffers-commands.c',
+ 'channels-actions.c',
+ 'channels-commands.c',
+ 'colormap-actions.c',
+ 'colormap-commands.c',
+ 'context-actions.c',
+ 'context-commands.c',
+ 'cursor-info-actions.c',
+ 'cursor-info-commands.c',
+ 'data-commands.c',
+ 'data-editor-commands.c',
+ 'debug-actions.c',
+ 'debug-commands.c',
+ 'dialogs-actions.c',
+ 'dialogs-commands.c',
+ 'dock-actions.c',
+ 'dock-commands.c',
+ 'dockable-actions.c',
+ 'dockable-commands.c',
+ 'documents-actions.c',
+ 'documents-commands.c',
+ 'drawable-actions.c',
+ 'drawable-commands.c',
+ 'dynamics-actions.c',
+ 'dynamics-editor-actions.c',
+ 'edit-actions.c',
+ 'edit-commands.c',
+ 'error-console-actions.c',
+ 'error-console-commands.c',
+ 'file-actions.c',
+ 'file-commands.c',
+ 'filters-actions.c',
+ 'filters-commands.c',
+ 'fonts-actions.c',
+ 'fonts-commands.c',
+ 'gimpgeglprocedure.c',
+ 'gradient-editor-actions.c',
+ 'gradient-editor-commands.c',
+ 'gradients-actions.c',
+ 'gradients-commands.c',
+ 'help-actions.c',
+ 'help-commands.c',
+ 'image-actions.c',
+ 'image-commands.c',
+ 'images-actions.c',
+ 'images-commands.c',
+ 'items-actions.c',
+ 'items-commands.c',
+ 'layers-actions.c',
+ 'layers-commands.c',
+ 'mypaint-brushes-actions.c',
+ 'palette-editor-actions.c',
+ 'palette-editor-commands.c',
+ 'palettes-actions.c',
+ 'palettes-commands.c',
+ 'patterns-actions.c',
+ 'plug-in-actions.c',
+ 'plug-in-commands.c',
+ 'procedure-commands.c',
+ 'quick-mask-actions.c',
+ 'quick-mask-commands.c',
+ 'sample-points-actions.c',
+ 'sample-points-commands.c',
+ 'select-actions.c',
+ 'select-commands.c',
+ 'templates-actions.c',
+ 'templates-commands.c',
+ 'text-editor-actions.c',
+ 'text-editor-commands.c',
+ 'text-tool-actions.c',
+ 'text-tool-commands.c',
+ 'tool-options-actions.c',
+ 'tool-options-commands.c',
+ 'tool-preset-editor-actions.c',
+ 'tool-preset-editor-commands.c',
+ 'tool-presets-actions.c',
+ 'tool-presets-commands.c',
+ 'tools-actions.c',
+ 'tools-commands.c',
+ 'vectors-actions.c',
+ 'vectors-commands.c',
+ 'view-actions.c',
+ 'view-commands.c',
+ 'window-actions.c',
+ 'window-commands.c',
+ 'windows-actions.c',
+ 'windows-commands.c',
+]
+
+
+libappactions = static_library('appactions',
+ libappactions_sources,
+ include_directories: [ rootInclude, rootAppInclude, ],
+ c_args: [
+ '-DG_LOG_DOMAIN="Gimp-Actions"',
+ ],
+ dependencies: [
+ gegl, gdk_pixbuf, gtk2,
+ ],
+)
+
+
diff --git a/app/config/meson.build b/app/config/meson.build
new file mode 100644
index 0000000..3b8ad66
--- /dev/null
+++ b/app/config/meson.build
@@ -0,0 +1,57 @@
+libappconfig_sources = [
+ 'gimpconfig-dump.c',
+ 'gimpconfig-file.c',
+ 'gimpconfig-utils.c',
+ 'gimpcoreconfig.c',
+ 'gimpdialogconfig.c',
+ 'gimpdisplayconfig.c',
+ 'gimpdisplayoptions.c',
+ 'gimpgeglconfig.c',
+ 'gimpguiconfig.c',
+ 'gimplangrc.c',
+ 'gimppluginconfig.c',
+ 'gimprc-deserialize.c',
+ 'gimprc-serialize.c',
+ 'gimprc-unknown.c',
+ 'gimprc.c',
+ 'gimpxmlparser.c',
+]
+
+# TODO mkenums
+libappconfig_sources += [
+ 'config-enums.c',
+]
+
+
+libappconfig = static_library('appconfig',
+ libappconfig_sources,
+ include_directories: [ rootInclude, rootAppInclude, ],
+ c_args: [
+ '-DG_LOG_DOMAIN="Gimp-Config"',
+ '-DGIMP_APP_VERSION_STRING="'+ app_version +'"',
+ '-DDATADIR="'+ datadir +'"',
+ ],
+ dependencies: [
+ cairo, gegl, gdk_pixbuf, gio, gio_specific, gtk2,
+ ],
+)
+
+
+executable('test-config',
+ 'test-config.c',
+ include_directories: [ rootInclude, rootAppInclude, ],
+
+ dependencies: [
+ gegl, gio, gio_specific,
+ ],
+ link_with: [
+ libgimpbase,
+ libgimpconfig,
+ libgimpcolor,
+ libgimpmath,
+ libappconfig,
+ libappcore,
+ ]
+
+
+)
\ No newline at end of file
diff --git a/app/core/meson.build b/app/core/meson.build
new file mode 100644
index 0000000..1c3760b
--- /dev/null
+++ b/app/core/meson.build
@@ -0,0 +1,217 @@
+libappcore_sources = [
+ 'gimp-batch.c',
+ 'gimp-cairo.c',
+ 'gimp-contexts.c',
+ 'gimp-data-factories.c',
+ 'gimp-edit.c',
+ 'gimp-filter-history.c',
+ 'gimp-gradients.c',
+ 'gimp-gui.c',
+ 'gimp-internal-data.c',
+ 'gimp-memsize.c',
+ 'gimp-modules.c',
+ 'gimp-palettes.c',
+ 'gimp-parasites.c',
+ 'gimp-tags.c',
+ 'gimp-templates.c',
+ 'gimp-transform-resize.c',
+ 'gimp-transform-utils.c',
+ 'gimp-units.c',
+ 'gimp-user-install.c',
+ 'gimp-utils.c',
+ 'gimp.c',
+ 'gimpbezierdesc.c',
+ 'gimpboundary.c',
+ 'gimpbrush-boundary.c',
+ 'gimpbrush-load.c',
+ 'gimpbrush-transform.c',
+ 'gimpbrush.c',
+ 'gimpbrushcache.c',
+ 'gimpbrushclipboard.c',
+ 'gimpbrushgenerated-load.c',
+ 'gimpbrushgenerated-save.c',
+ 'gimpbrushgenerated.c',
+ 'gimpbrushpipe-load.c',
+ 'gimpbrushpipe.c',
+ 'gimpbuffer.c',
+ 'gimpchannel-combine.c',
+ 'gimpchannel-select.c',
+ 'gimpchannel.c',
+ 'gimpchannelpropundo.c',
+ 'gimpchannelundo.c',
+ 'gimpcontainer-filter.c',
+ 'gimpcontainer.c',
+ 'gimpcontext.c',
+ 'gimpcoords-interpolate.c',
+ 'gimpcoords.c',
+ 'gimpcurve-load.c',
+ 'gimpcurve-map.c',
+ 'gimpcurve-save.c',
+ 'gimpcurve.c',
+ 'gimpdashpattern.c',
+ 'gimpdata.c',
+ 'gimpdatafactory.c',
+ 'gimpdocumentlist.c',
+ 'gimpdrawable-blend.c',
+ 'gimpdrawable-bucket-fill.c',
+ 'gimpdrawable-combine.c',
+ 'gimpdrawable-equalize.c',
+ 'gimpdrawable-fill.c',
+ 'gimpdrawable-filters.c',
+ 'gimpdrawable-floating-selection.c',
+ 'gimpdrawable-foreground-extract.c',
+ 'gimpdrawable-histogram.c',
+ 'gimpdrawable-levels.c',
+ 'gimpdrawable-offset.c',
+ 'gimpdrawable-operation.c',
+ 'gimpdrawable-preview.c',
+ 'gimpdrawable-shadow.c',
+ 'gimpdrawable-stroke.c',
+ 'gimpdrawable-transform.c',
+ 'gimpdrawable.c',
+ 'gimpdrawablefilter.c',
+ 'gimpdrawablemodundo.c',
+ 'gimpdrawablestack.c',
+ 'gimpdrawableundo.c',
+ 'gimpdynamics-load.c',
+ 'gimpdynamics-save.c',
+ 'gimpdynamics.c',
+ 'gimpdynamicsoutput.c',
+ 'gimperror.c',
+ 'gimpfilloptions.c',
+ 'gimpfilter.c',
+ 'gimpfilteredcontainer.c',
+ 'gimpfilterstack.c',
+ 'gimpfloatingselectionundo.c',
+ 'gimpgradient-load.c',
+ 'gimpgradient-save.c',
+ 'gimpgradient.c',
+ 'gimpgrid.c',
+ 'gimpgrouplayer.c',
+ 'gimpgrouplayerundo.c',
+ 'gimpguide.c',
+ 'gimpguideundo.c',
+ 'gimphistogram.c',
+ 'gimpidtable.c',
+ 'gimpimage-arrange.c',
+ 'gimpimage-color-profile.c',
+ 'gimpimage-colormap.c',
+ 'gimpimage-convert-indexed.c',
+ 'gimpimage-convert-precision.c',
+ 'gimpimage-convert-type.c',
+ 'gimpimage-crop.c',
+ 'gimpimage-duplicate.c',
+ 'gimpimage-flip.c',
+ 'gimpimage-grid.c',
+ 'gimpimage-guides.c',
+ 'gimpimage-item-list.c',
+ 'gimpimage-merge.c',
+ 'gimpimage-metadata.c',
+ 'gimpimage-new.c',
+ 'gimpimage-pick-color.c',
+ 'gimpimage-pick-item.c',
+ 'gimpimage-preview.c',
+ 'gimpimage-quick-mask.c',
+ 'gimpimage-resize.c',
+ 'gimpimage-rotate.c',
+ 'gimpimage-sample-points.c',
+ 'gimpimage-scale.c',
+ 'gimpimage-snap.c',
+ 'gimpimage-symmetry.c',
+ 'gimpimage-undo-push.c',
+ 'gimpimage-undo.c',
+ 'gimpimage.c',
+ 'gimpimagefile.c',
+ 'gimpimageundo.c',
+ 'gimpitem-exclusive.c',
+ 'gimpitem-linked.c',
+ 'gimpitem-preview.c',
+ 'gimpitem.c',
+ 'gimpitempropundo.c',
+ 'gimpitemstack.c',
+ 'gimpitemtree.c',
+ 'gimpitemundo.c',
+ 'gimplayer-floating-selection.c',
+ 'gimplayer-new.c',
+ 'gimplayer.c',
+ 'gimplayermask.c',
+ 'gimplayermaskpropundo.c',
+ 'gimplayermaskundo.c',
+ 'gimplayerpropundo.c',
+ 'gimplayerstack.c',
+ 'gimplayerundo.c',
+ 'gimplist.c',
+ 'gimpmarshal.c',
+ 'gimpmaskundo.c',
+ 'gimpmybrush-load.c',
+ 'gimpmybrush.c',
+ 'gimpobject.c',
+ 'gimppaintinfo.c',
+ 'gimppalette-import.c',
+ 'gimppalette-load.c',
+ 'gimppalette-save.c',
+ 'gimppalette.c',
+ 'gimppalettemru.c',
+ 'gimpparamspecs-desc.c',
+ 'gimpparamspecs-duplicate.c',
+ 'gimpparamspecs.c',
+ 'gimpparasitelist.c',
+ 'gimppattern-load.c',
+ 'gimppattern.c',
+ 'gimppatternclipboard.c',
+ 'gimppdbprogress.c',
+ 'gimppickable-auto-shrink.c',
+ 'gimppickable-contiguous-region.c',
+ 'gimppickable.c',
+ 'gimpprogress.c',
+ 'gimpprojectable.c',
+ 'gimpprojection.c',
+ 'gimpsamplepoint.c',
+ 'gimpsamplepointundo.c',
+ 'gimpscanconvert.c',
+ 'gimpselection.c',
+ 'gimpsettings.c',
+ 'gimpstrokeoptions.c',
+ 'gimpsubprogress.c',
+ 'gimpsymmetry-mandala.c',
+ 'gimpsymmetry-mirror.c',
+ 'gimpsymmetry-tiling.c',
+ 'gimpsymmetry.c',
+ 'gimptag.c',
+ 'gimptagcache.c',
+ 'gimptagged.c',
+ 'gimptaggedcontainer.c',
+ 'gimptempbuf.c',
+ 'gimptemplate.c',
+ 'gimptilehandlerprojectable.c',
+ 'gimptoolinfo.c',
+ 'gimptooloptions.c',
+ 'gimptoolpreset-load.c',
+ 'gimptoolpreset-save.c',
+ 'gimptoolpreset.c',
+ 'gimptreehandler.c',
+ 'gimpundo.c',
+ 'gimpundostack.c',
+ 'gimpunit.c',
+ 'gimpviewable.c',
+]
+
+# TODO mkenums
+libappcore_sources += [
+ 'core-enums.c',
+ # 'gimpmarshall.c',
+]
+
+libappcore = static_library('appcore',
+ libappcore_sources,
+ include_directories: [ rootInclude, rootAppInclude, ],
+ c_args: [
+ '-DG_LOG_DOMAIN="Gimp-Core"',
+ '-DGIMPDIR="'+ gimpdir +'"',
+ '-DGIMP_APP_VERSION="'+ app_version +'"',
+ '-DGIMP_USER_VERSION="'+ user_version +'"',
+ ],
+ dependencies: [
+ cairo, gegl, gdk_pixbuf, libmypaint, gexiv2,
+ ],
+)
diff --git a/app/meson.build b/app/meson.build
new file mode 100644
index 0000000..bfb720b
--- /dev/null
+++ b/app/meson.build
@@ -0,0 +1,12 @@
+
+rootAppInclude = include_directories('.')
+
+
+# Order is important!
+subdir('actions')
+subdir('core')
+subdir('xcf')
+
+
+
+# subdir('config')
diff --git a/app/xcf/meson.build b/app/xcf/meson.build
new file mode 100644
index 0000000..6a38bf6
--- /dev/null
+++ b/app/xcf/meson.build
@@ -0,0 +1,19 @@
+
+libappxcf = static_library('appxcf',
+ [
+ 'xcf-load.c',
+ 'xcf-read.c',
+ 'xcf-save.c',
+ 'xcf-seek.c',
+ 'xcf-utils.c',
+ 'xcf-write.c',
+ 'xcf.c',
+ ],
+ include_directories: [ rootInclude, rootAppInclude, ],
+ c_args: [
+ '-DG_LOG_DOMAIN="Gimp-XCF"',
+ ],
+ dependencies: [
+ cairo, gegl, gdk_pixbuf
+ ],
+)
diff --git a/meson.build b/meson.build
index d46257f..8130737 100644
--- a/meson.build
+++ b/meson.build
@@ -204,6 +204,11 @@ if platform_win32
endif
endif
+# Check for finite or isfinite
+has_finite = cc.has_function('finite', prefix: '#include <math.h>')
+has_isfinite= cc.has_function('isfinite', prefix: '#include <math.h>')
+conf.set('HAVE_FINITE', has_finite)
+conf.set('HAVE_ISFINITE', has_isfinite)
# Check for compiler CPU extensions
@@ -770,10 +775,10 @@ subdir('libgimpwidgets')
subdir('libgimp')
# Executables, plugins
-# subdir('modules')
+subdir('modules')
# subdir('plug-ins')
-# subdir('tools')
-# subdir('app')
+subdir('tools')
+subdir('app')
# subdir('build')
diff --git a/modules/meson.build b/modules/meson.build
new file mode 100644
index 0000000..e495a3f
--- /dev/null
+++ b/modules/meson.build
@@ -0,0 +1,118 @@
+
+global_cflags = []
+global_lflags = []
+
+global_cflags += [
+]
+
+if platform_win32
+ global_cflags += '-no-undefined'
+endif
+
+if platform_osx
+ global_cflags += '-xobjective-c'
+ global_lflags += ['-framework', 'Cocoa']
+endif
+
+if os_win32
+ # global_lflags += ['-export-symbols', 'gimpmath.def']
+endif
+
+modules_deps = [
+ gtk2, babl, gegl,
+]
+
+color_selector_libs = [
+ libgimpcolor,
+ libgimpconfig,
+ libgimpmodule,
+ libgimpwidgets,
+]
+controller_libs = [
+ libgimpmodule,
+ libgimpwidgets,
+]
+display_filter_libs = [
+ libgimpbase,
+ libgimpcolor,
+ libgimpconfig,
+ libgimpmodule,
+ libgimpwidgets,
+]
+
+libcolor_selector_cmyk = library('color-selector-cmyk',
+ 'color-selector-cmyk.c',
+ include_directories: rootInclude,
+ dependencies: modules_deps,
+ link_with: color_selector_libs,
+)
+
+libcolor_selector_water = library('color-selector-water',
+ 'color-selector-water.c',
+ include_directories: rootInclude,
+ dependencies: modules_deps,
+ link_with: color_selector_libs,
+)
+
+libcolor_selector_wheel = library('color-selector-wheel',
+ [
+ 'color-selector-wheel.c',
+ 'gimpcolorwheel.c',
+ ],
+ include_directories: rootInclude,
+ dependencies: modules_deps,
+ link_with: color_selector_libs,
+)
+
+if have_linuxinput
+libcontroller_linux_input = library('controller-linux-input',
+ [
+ 'controller-linux-input.c',
+ 'gimpinputdevicestore-gudev.c',
+ ],
+ include_directories: rootInclude,
+ dependencies: modules_deps,
+ link_with: controller_libs,
+)
+endif
+if have_directXinput
+libcontroller_dx_input = library('controller-dx-input',
+ [
+ 'controller-dx-dinput.c',
+ 'gimpinputdevicestore-dx.c',
+ ],
+ include_directories: rootInclude,
+ dependencies: [modules_deps, directx],
+ link_with: [controller_libs, '-lrpcrt4'],
+)
+
+endif
+if not platform_win32
+libcontroller_midi = library('controller-midi',
+ 'controller-midi.c',
+ include_directories: rootInclude,
+ dependencies:modules_deps,
+ link_with: controller_libs,
+)
+endif
+
+libdisplay_filter_color_blind = library('display-filter-color-blind',
+ 'display-filter-color-blind.c',
+ include_directories: rootInclude,
+ dependencies: modules_deps,
+ link_with: display_filter_libs,
+)
+
+libdisplay_filter_gamma = library('display-filter-gamma',
+ 'display-filter-gamma.c',
+ include_directories: rootInclude,
+ dependencies: modules_deps,
+ link_with: display_filter_libs,
+)
+
+libdisplay_filter_high_contrast = library('display-filter-high-contrast',
+ 'display-filter-high-contrast.c',
+ include_directories: rootInclude,
+ dependencies: modules_deps,
+ link_with: display_filter_libs,
+)
diff --git a/tools/meson.build b/tools/meson.build
new file mode 100644
index 0000000..01f4cac
--- /dev/null
+++ b/tools/meson.build
@@ -0,0 +1,70 @@
+
+
+
+if os_win32
+ gimp_debug_resume = executable('gimp-debug-resume', 'gimp-debug-resume.c')
+endif
+
+
+
+tools_cflags = [
+ '-DBINDIR="'+ get_option('bindir') +'"',
+ '-DCC="'+ cc.get_id() +'"',
+ '-DDATADIR="'+ datadir +'"',
+ '-DDATAROOTDIR="'+ datadir +'"',
+ '-DEXEC_PREFIX="'+ prefix +'"',
+ '-DGIMP_APP_VERSION="'+ app_version +'"',
+ '-DGIMP_PLUGIN_VERSION="'+ plugin_version +'"',
+ '-DGIMPDATADIR="'+ datadir +'"',
+ '-DGIMPDIR="'+ gimpdir +'"',
+ '-DGIMPPLUGINDIR="'+ plugindir +'"',
+ '-DINFODIR="'+ get_option('infodir') +'"',
+ '-DLIBDIR="'+ get_option('libdir') +'"',
+ '-DLIBEXECDIR="'+ get_option('libexecdir') +'"',
+ '-DLOCALEDIR="'+ localedir +'"',
+ '-DLOCALSTATEDIR="'+ get_option('localstatedir') +'"',
+ '-DMANDIR="'+ get_option('mandir') +'"',
+ '-DPREFIX="'+ prefix +'"',
+ '-DSBINDIR="'+ get_option('sbindir') +'"',
+ '-DSHAREDSTATEDIR="'+ get_option('sharedstatedir') +'"',
+ '-DSYSCONFDIR="'+ sysconfdir +'"',
+]
+
+
+
+
+gimptool = executable('gimptool-2.0',
+ 'gimptool.c',
+
+ include_directories: rootInclude,
+ dependencies: [
+ gtk2,
+ ],
+ link_with: [
+ libgimpbase,
+ ],
+ c_args: tools_cflags,
+ install: true,
+)
+
+
+executable('kernelgen',
+ 'kernelgen.c',
+ include_directories: rootInclude,
+ install: false,
+)
+executable('test-clipboard',
+ 'test-clipboard.c',
+ include_directories: rootInclude,
+ dependencies: [
+ gtk2,
+ ],
+ install: false,
+)
+
+if have_vector_icons
+ executable('invert-svg',
+ 'invert-svg.c',
+ dependencies: gio,
+ )
+endif
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]