From 9b117a6de75e0bd6d5af8841e0ad6a6e423210d4 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Sun, 27 Jul 2003 22:43:11 +0000 Subject: [PATCH] Use -mwindows on Win32. 2003-07-27 Tor Lillqvist * plug-ins/*/Makefile.am: Use -mwindows on Win32. --- ChangeLog | 4 ++++ plug-ins/FractalExplorer/Makefile.am | 6 ++++++ plug-ins/Lighting/Makefile.am | 6 ++++++ plug-ins/MapObject/Makefile.am | 6 ++++++ plug-ins/bmp/Makefile.am | 6 ++++++ plug-ins/dbbrowser/Makefile.am | 6 ++++++ plug-ins/faxg3/Makefile.am | 6 ++++++ plug-ins/fits/Makefile.am | 6 ++++++ plug-ins/flame/Makefile.am | 6 ++++++ plug-ins/fp/Makefile.am | 6 ++++++ plug-ins/gfig/Makefile.am | 6 ++++++ plug-ins/gflare/Makefile.am | 6 ++++++ plug-ins/gfli/Makefile.am | 6 ++++++ plug-ins/gimpressionist/Makefile.am | 6 ++++++ plug-ins/ifscompose/Makefile.am | 6 ++++++ plug-ins/imagemap/Makefile.am | 6 ++++++ plug-ins/maze/Makefile.am | 6 ++++++ plug-ins/mosaic/Makefile.am | 6 ++++++ plug-ins/pagecurl/Makefile.am | 6 ++++++ plug-ins/rcm/Makefile.am | 6 ++++++ plug-ins/script-fu/Makefile.am | 6 ++++++ plug-ins/sel2path/Makefile.am | 6 ++++++ plug-ins/sgi/Makefile.am | 6 ++++++ plug-ins/twain/twain.c | 2 -- plug-ins/webbrowser/Makefile.am | 6 ++++++ 25 files changed, 142 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8e74879406..6ff25592e5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2003-07-27 Tor Lillqvist + + * plug-ins/*/Makefile.am: Use -mwindows on Win32. + 2003-07-27 Henrik Brix Andersen * app/gui/image-menu.c (image_menu_entries): moved Configure Grid diff --git a/plug-ins/FractalExplorer/Makefile.am b/plug-ins/FractalExplorer/Makefile.am index 5bc5c606cd..0c5c504076 100644 --- a/plug-ins/FractalExplorer/Makefile.am +++ b/plug-ins/FractalExplorer/Makefile.am @@ -1,5 +1,11 @@ ## Process this file with automake to produce Makefile.in +if OS_WIN32 +mwindows = -mwindows +endif + +AM_LDFLAGS = $(mwindows) + SUBDIRS = fractalexplorer-examples libexecdir = $(gimpplugindir)/plug-ins diff --git a/plug-ins/Lighting/Makefile.am b/plug-ins/Lighting/Makefile.am index 8cb9308303..b636745f2f 100644 --- a/plug-ins/Lighting/Makefile.am +++ b/plug-ins/Lighting/Makefile.am @@ -1,5 +1,11 @@ ## Process this file with automake to produce Makefile.in +if OS_WIN32 +mwindows = -mwindows +endif + +AM_LDFLAGS = $(mwindows) + libexecdir = $(gimpplugindir)/plug-ins libexec_PROGRAMS = Lighting diff --git a/plug-ins/MapObject/Makefile.am b/plug-ins/MapObject/Makefile.am index db8badcb7c..1e0359aab8 100644 --- a/plug-ins/MapObject/Makefile.am +++ b/plug-ins/MapObject/Makefile.am @@ -1,5 +1,11 @@ ## Process this file with automake to produce Makefile.in +if OS_WIN32 +mwindows = -mwindows +endif + +AM_LDFLAGS = $(mwindows) + libexecdir = $(gimpplugindir)/plug-ins libexec_PROGRAMS = MapObject diff --git a/plug-ins/bmp/Makefile.am b/plug-ins/bmp/Makefile.am index 93870748f1..c56013b582 100644 --- a/plug-ins/bmp/Makefile.am +++ b/plug-ins/bmp/Makefile.am @@ -1,5 +1,11 @@ ## Process this file with automake to produce Makefile.in +if OS_WIN32 +mwindows = -mwindows +endif + +AM_LDFLAGS = $(mwindows) + libexecdir = $(gimpplugindir)/plug-ins libexec_PROGRAMS = bmp diff --git a/plug-ins/dbbrowser/Makefile.am b/plug-ins/dbbrowser/Makefile.am index 9e9ea2a073..6061be97d9 100644 --- a/plug-ins/dbbrowser/Makefile.am +++ b/plug-ins/dbbrowser/Makefile.am @@ -1,5 +1,11 @@ ## Process this file with automake to produce Makefile.in +if OS_WIN32 +mwindows = -mwindows +endif + +AM_LDFLAGS = $(mwindows) + libexecdir = $(gimpplugindir)/plug-ins libexec_PROGRAMS = dbbrowser diff --git a/plug-ins/faxg3/Makefile.am b/plug-ins/faxg3/Makefile.am index 6646726e5d..7ebf42e1ab 100644 --- a/plug-ins/faxg3/Makefile.am +++ b/plug-ins/faxg3/Makefile.am @@ -1,5 +1,11 @@ ## Process this file with automake to produce Makefile.in +if OS_WIN32 +mwindows = -mwindows +endif + +AM_LDFLAGS = $(mwindows) + libexecdir = $(gimpplugindir)/plug-ins libexec_PROGRAMS = faxg3 diff --git a/plug-ins/fits/Makefile.am b/plug-ins/fits/Makefile.am index 6c0913ff37..72f8b47989 100644 --- a/plug-ins/fits/Makefile.am +++ b/plug-ins/fits/Makefile.am @@ -1,5 +1,11 @@ ## Process this file with automake to produce Makefile.in +if OS_WIN32 +mwindows = -mwindows +endif + +AM_LDFLAGS = $(mwindows) + libexecdir = $(gimpplugindir)/plug-ins libexec_PROGRAMS = fits diff --git a/plug-ins/flame/Makefile.am b/plug-ins/flame/Makefile.am index 494dc95a3c..f24b4d78cf 100644 --- a/plug-ins/flame/Makefile.am +++ b/plug-ins/flame/Makefile.am @@ -1,5 +1,11 @@ ## Process this file with automake to produce Makefile.in +if OS_WIN32 +mwindows = -mwindows +endif + +AM_LDFLAGS = $(mwindows) + libexecdir = $(gimpplugindir)/plug-ins libexec_PROGRAMS = flame diff --git a/plug-ins/fp/Makefile.am b/plug-ins/fp/Makefile.am index 378b2246ae..5548d8c920 100644 --- a/plug-ins/fp/Makefile.am +++ b/plug-ins/fp/Makefile.am @@ -1,5 +1,11 @@ ## Process this file with automake to produce Makefile.in +if OS_WIN32 +mwindows = -mwindows +endif + +AM_LDFLAGS = $(mwindows) + libexecdir = $(gimpplugindir)/plug-ins libexec_PROGRAMS = fp diff --git a/plug-ins/gfig/Makefile.am b/plug-ins/gfig/Makefile.am index dd11bf2101..bc6291bbe5 100644 --- a/plug-ins/gfig/Makefile.am +++ b/plug-ins/gfig/Makefile.am @@ -1,5 +1,11 @@ ## Process this file with automake to produce Makefile.in +if OS_WIN32 +mwindows = -mwindows +endif + +AM_LDFLAGS = $(mwindows) + SUBDIRS = gfig-examples images libexecdir = $(gimpplugindir)/plug-ins diff --git a/plug-ins/gflare/Makefile.am b/plug-ins/gflare/Makefile.am index d76eb8b20f..1d34b01ecc 100644 --- a/plug-ins/gflare/Makefile.am +++ b/plug-ins/gflare/Makefile.am @@ -1,5 +1,11 @@ ## Process this file with automake to produce Makefile.in +if OS_WIN32 +mwindows = -mwindows +endif + +AM_LDFLAGS = $(mwindows) + SUBDIRS = gflares libexecdir = $(gimpplugindir)/plug-ins diff --git a/plug-ins/gfli/Makefile.am b/plug-ins/gfli/Makefile.am index 7cfa5f44ac..d650e67ba3 100644 --- a/plug-ins/gfli/Makefile.am +++ b/plug-ins/gfli/Makefile.am @@ -1,5 +1,11 @@ ## Process this file with automake to produce Makefile.in +if OS_WIN32 +mwindows = -mwindows +endif + +AM_LDFLAGS = $(mwindows) + libexecdir = $(gimpplugindir)/plug-ins libexec_PROGRAMS = gfli diff --git a/plug-ins/gimpressionist/Makefile.am b/plug-ins/gimpressionist/Makefile.am index 360713282c..b4d76458da 100644 --- a/plug-ins/gimpressionist/Makefile.am +++ b/plug-ins/gimpressionist/Makefile.am @@ -1,5 +1,11 @@ ## Process this file with automake to produce Makefile.in +if OS_WIN32 +mwindows = -mwindows +endif + +AM_LDFLAGS = $(mwindows) + SUBDIRS = Brushes Paper Presets libexecdir = $(gimpplugindir)/plug-ins diff --git a/plug-ins/ifscompose/Makefile.am b/plug-ins/ifscompose/Makefile.am index 5759340a81..b56d5f2662 100644 --- a/plug-ins/ifscompose/Makefile.am +++ b/plug-ins/ifscompose/Makefile.am @@ -1,5 +1,11 @@ ## Process this file with automake to produce Makefile.in +if OS_WIN32 +mwindows = -mwindows +endif + +AM_LDFLAGS = $(mwindows) + libexecdir = $(gimpplugindir)/plug-ins libexec_PROGRAMS = ifscompose diff --git a/plug-ins/imagemap/Makefile.am b/plug-ins/imagemap/Makefile.am index ed0f8b6d57..1d799db681 100644 --- a/plug-ins/imagemap/Makefile.am +++ b/plug-ins/imagemap/Makefile.am @@ -1,5 +1,11 @@ ## Process this file with automake to produce Makefile.in +if OS_WIN32 +mwindows = -mwindows +endif + +AM_LDFLAGS = $(mwindows) + libexecdir = $(gimpplugindir)/plug-ins libexec_PROGRAMS = imagemap diff --git a/plug-ins/maze/Makefile.am b/plug-ins/maze/Makefile.am index 838b347f4e..da19aff326 100644 --- a/plug-ins/maze/Makefile.am +++ b/plug-ins/maze/Makefile.am @@ -1,5 +1,11 @@ ## Process this file with automake to produce Makefile.in +if OS_WIN32 +mwindows = -mwindows +endif + +AM_LDFLAGS = $(mwindows) + libexecdir = $(gimpplugindir)/plug-ins libexec_PROGRAMS = maze diff --git a/plug-ins/mosaic/Makefile.am b/plug-ins/mosaic/Makefile.am index c6f9c5faa7..fccb578d4c 100644 --- a/plug-ins/mosaic/Makefile.am +++ b/plug-ins/mosaic/Makefile.am @@ -1,5 +1,11 @@ ## Process this file with automake to produce Makefile.in +if OS_WIN32 +mwindows = -mwindows +endif + +AM_LDFLAGS = $(mwindows) + libexecdir = $(gimpplugindir)/plug-ins libexec_PROGRAMS = mosaic diff --git a/plug-ins/pagecurl/Makefile.am b/plug-ins/pagecurl/Makefile.am index 7828d6fddf..95e4e4a2b4 100644 --- a/plug-ins/pagecurl/Makefile.am +++ b/plug-ins/pagecurl/Makefile.am @@ -1,5 +1,11 @@ ## Process this file with automake to produce Makefile.in +if OS_WIN32 +mwindows = -mwindows +endif + +AM_LDFLAGS = $(mwindows) + libexecdir = $(gimpplugindir)/plug-ins libexec_PROGRAMS = pagecurl diff --git a/plug-ins/rcm/Makefile.am b/plug-ins/rcm/Makefile.am index 3f425ca78c..9172a8e8dc 100644 --- a/plug-ins/rcm/Makefile.am +++ b/plug-ins/rcm/Makefile.am @@ -1,5 +1,11 @@ ## Process this file with automake to produce Makefile.in +if OS_WIN32 +mwindows = -mwindows +endif + +AM_LDFLAGS = $(mwindows) + libexecdir = $(gimpplugindir)/plug-ins libexec_PROGRAMS = rcm diff --git a/plug-ins/script-fu/Makefile.am b/plug-ins/script-fu/Makefile.am index 30877874e3..fda47f4473 100644 --- a/plug-ins/script-fu/Makefile.am +++ b/plug-ins/script-fu/Makefile.am @@ -1,5 +1,11 @@ ## Process this file with automake to produce Makefile.in +if OS_WIN32 +mwindows = -mwindows +endif + +AM_LDFLAGS = $(mwindows) + SUBDIRS = scripts libexecdir = $(gimpplugindir)/plug-ins diff --git a/plug-ins/sel2path/Makefile.am b/plug-ins/sel2path/Makefile.am index 9c92d3ef2b..cdb5d5cec4 100644 --- a/plug-ins/sel2path/Makefile.am +++ b/plug-ins/sel2path/Makefile.am @@ -1,5 +1,11 @@ ## Process this file with automake to produce Makefile.in +if OS_WIN32 +mwindows = -mwindows +endif + +AM_LDFLAGS = $(mwindows) + libexecdir = $(gimpplugindir)/plug-ins libexec_PROGRAMS = sel2path diff --git a/plug-ins/sgi/Makefile.am b/plug-ins/sgi/Makefile.am index 09f95db466..c76d1ce61c 100644 --- a/plug-ins/sgi/Makefile.am +++ b/plug-ins/sgi/Makefile.am @@ -1,5 +1,11 @@ ## Process this file with automake to produce Makefile.in +if OS_WIN32 +mwindows = -mwindows +endif + +AM_LDFLAGS = $(mwindows) + libexecdir = $(gimpplugindir)/plug-ins libexec_PROGRAMS = sgi diff --git a/plug-ins/twain/twain.c b/plug-ins/twain/twain.c index 93a8c4bb0b..e5fccff2dd 100644 --- a/plug-ins/twain/twain.c +++ b/plug-ins/twain/twain.c @@ -66,8 +66,6 @@ #include #include -#include - #include "libgimp/gimp.h" #include "libgimp/stdplugins-intl.h" diff --git a/plug-ins/webbrowser/Makefile.am b/plug-ins/webbrowser/Makefile.am index 90080cc729..982eb60f84 100644 --- a/plug-ins/webbrowser/Makefile.am +++ b/plug-ins/webbrowser/Makefile.am @@ -1,5 +1,11 @@ ## Process this file with automake to produce Makefile.in +if OS_WIN32 +mwindows = -mwindows +endif + +AM_LDFLAGS = $(mwindows) + scriptdatadir = $(gimpdatadir)/scripts scriptdata_DATA = web-browser.scm -- 2.22.0