[gimp/meson: 125/127] Move versionconfig declaration to root meson.build. Generate rc sources.
- From: Félix Piédallu <fpiedallu src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp/meson: 125/127] Move versionconfig declaration to root meson.build. Generate rc sources.
- Date: Fri, 2 Feb 2018 16:10:16 +0000 (UTC)
commit 4b30a37ed2c77ea7ab7a5990ec506900e8bfda5b
Author: Félix Piédallu <felix piedallu me>
Date: Fri Feb 2 11:58:34 2018 +0100
Move versionconfig declaration to root meson.build. Generate rc sources.
build/windows/meson.build | 16 +++++++++++++---
libgimpbase/meson.build | 6 ------
meson.build | 13 +++++++++----
plug-ins/file-bmp/meson.build | 12 +++++++++++-
4 files changed, 33 insertions(+), 14 deletions(-)
---
diff --git a/build/windows/meson.build b/build/windows/meson.build
index ba96f7d..28362f6 100644
--- a/build/windows/meson.build
+++ b/build/windows/meson.build
@@ -1,3 +1,13 @@
-if get_option('windows-installer')
- # subdir('installer')
-endif
+# Windows specific
+
+gimp_plugins_rc = configure_file(
+ input : 'gimp-plug-ins.rc.in',
+ output: 'gimp-plug-ins.rc',
+ configuration: versionconfig,
+)
+
+gimp_app_rc = configure_file(
+ input : 'gimp.rc.in',
+ output: 'gimp.rc',
+ configuration: versionconfig,
+)
diff --git a/libgimpbase/meson.build b/libgimpbase/meson.build
index 09ea36d..7c39090 100644
--- a/libgimpbase/meson.build
+++ b/libgimpbase/meson.build
@@ -1,10 +1,4 @@
-versionconfig = configuration_data()
-versionconfig.set('GIMP_MAJOR_VERSION', major_version)
-versionconfig.set('GIMP_MINOR_VERSION', minor_version)
-versionconfig.set('GIMP_MICRO_VERSION', micro_version)
-versionconfig.set('GIMP_VERSION', gimp_version)
-versionconfig.set('GIMP_API_VERSION', api_version)
gimpversion = configure_file(
input : 'gimpversion.h.in',
output: 'gimpversion.h',
diff --git a/meson.build b/meson.build
index 4bf37e1..448a46d 100644
--- a/meson.build
+++ b/meson.build
@@ -69,6 +69,14 @@ so_version = '@0@.@1@.@2@'.format(lt_revision, lt_current, lt_current_minus_age)
stable = (minor_version % 2 == 0)
conf.set10('GIMP_UNSTABLE', not stable)
+versionconfig = configuration_data()
+versionconfig.set('GIMP_FULL_NAME', full_name)
+versionconfig.set('GIMP_MAJOR_VERSION', major_version)
+versionconfig.set('GIMP_MINOR_VERSION', minor_version)
+versionconfig.set('GIMP_MICRO_VERSION', micro_version)
+versionconfig.set('GIMP_VERSION', gimp_version)
+versionconfig.set('GIMP_API_VERSION', api_version)
+
################################################################################
# Host system detection
@@ -831,6 +839,7 @@ rootInclude = include_directories('.')
################################################################################
# Subdirs
+subdir('build/windows')
# Tools (need libgimpbase now)
subdir('libgimpbase')
@@ -873,11 +882,7 @@ subdir('app')
subdir('pdb')
# subdir('build/windows/installer')
-# subdir('build/windows/installer/lang')
# subdir('po-windows-installer')
-# subdir('build')
-# build/windows/gimp-plug-ins.rc
-# build/windows/gimp.rc
# Docs
subdir('devel-docs')
diff --git a/plug-ins/file-bmp/meson.build b/plug-ins/file-bmp/meson.build
index 9428143..10780c6 100644
--- a/plug-ins/file-bmp/meson.build
+++ b/plug-ins/file-bmp/meson.build
@@ -1,10 +1,20 @@
-# TODO file-bmp.rc.o
+rc_file = platform_win32 ? windows.compile_resources(
+ gimp_plugins_rc,
+ args: [
+
+ ],
+ include_directories: [
+
+ ],
+) : []
+
file_bmp = executable('file-bmp',
[
'bmp-load.c',
'bmp-save.c',
'bmp.c',
+ rc_file,
],
include_directories: [ rootInclude, ],
dependencies: [
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]