[gimp/meson: 115/128] Fix windows build/link
- From: Félix Piédallu <fpiedallu src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp/meson: 115/128] Fix windows build/link
- Date: Mon, 12 Feb 2018 13:49:29 +0000 (UTC)
commit 0ce8e7d33da38155b7ae9aa0b30a13fed165ee40
Author: Félix Piédallu <felix piedallu me>
Date: Tue Jan 30 12:11:03 2018 +0100
Fix windows build/link
plug-ins/script-fu/meson.build | 4 +++-
plug-ins/twain/meson.build | 5 -----
2 files changed, 3 insertions(+), 6 deletions(-)
---
diff --git a/plug-ins/script-fu/meson.build b/plug-ins/script-fu/meson.build
index 9da857c..8ec3d79 100644
--- a/plug-ins/script-fu/meson.build
+++ b/plug-ins/script-fu/meson.build
@@ -20,11 +20,13 @@ plugin_scriptfu_sources = [
'script-fu.c',
]
+winsock = platform_win32 ? cc.find_library('ws2_32') : []
+
scriptfu = executable('script-fu',
plugin_scriptfu_sources,
include_directories: [ rootInclude, ],
dependencies: [
- gegl, gtk2, math,
+ gegl, gtk2, math, winsock,
],
c_args: [
'-DSTANDALONE=0',
diff --git a/plug-ins/twain/meson.build b/plug-ins/twain/meson.build
index 15dd863..f8f1e0a 100644
--- a/plug-ins/twain/meson.build
+++ b/plug-ins/twain/meson.build
@@ -41,11 +41,6 @@ twain = executable('twain',
libgimpcolor,
libgimpbase,
],
- link_args: [
- '-lrt',
- '-luser32',
- '-mwindows',
- ],
install: true,
install_dir: join_paths(gimpplugindir, 'plug-ins'),
)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]