Commit 5c547107 authored by Tor Lillqvist's avatar Tor Lillqvist Committed by Tor Lillqvist

Drop makefile.mingw{,.in}.

2002-12-26  Tor Lillqvist  <tml@iki.fi>

	* app/Makefile.am (EXTRA_DIST): Drop makefile.mingw{,.in}.

	* libgimp/gimp.c: Define LIBGIMP_COMPILATION.
	(gimp_main) [Win32] Use g_ascii_strcasecmp().

	* libgimp/gimp.def: Add _readchannel (used by libgimpui).

	* libgimp/gimp.h: Fix minor typo in comment.

	* libgimp/Makefile.am: Similar additions for Win32 as in the other
	libgimp*/Makefile.am files: Use -no-undefined. Conditionally link
	to ../lib*/*.la as needed. Use the .def file. Produce MS style
	import library if possible. Install and uninstall import
	libraries. Don't distribute makefile.mingw{,.in}.
parent 5ed487b9
2002-12-25 Tor Lillqvist <tml@iki.fi>
2002-12-26 Tor Lillqvist <tml@iki.fi>
* app/Makefile.am (EXTRA_DIST): Drop makefile.mingw{,.in}.
* libgimp/gimp.c: Define LIBGIMP_COMPILATION.
(gimp_main) [Win32] Use g_ascii_strcasecmp().
* libgimp/gimp.def: Add _readchannel (used by libgimpui).
* libgimp/gimp.h: Fix minor typo in comment
* libgimpproxy/Makefile.am
* libgimptool/Makefile.am: Similar additions for Win32 as in the
other libgimp*/Makefile.am files: Use -no-undefined. Use the .def
file. Produce MS style import library if possible. Install and
uninstall import libraries.
* libgimptool/Makefile.am
* libgimp/Makefile.am: Similar additions for Win32 as in the other
libgimp*/Makefile.am files: Use -no-undefined. Conditionally link
to ../lib*/*.la as needed. Use the .def file. Produce MS style
import library if possible. Install and uninstall import
libraries. Don't distribute makefile.mingw{,.in}.
* libgimpproxy/gimpproxy.def
* libgimptool/gimptool.def: New files.
......
......@@ -66,8 +66,6 @@ gimp_1_3_SOURCES = \
$(stuff_sources)
EXTRA_DIST = \
makefile.mingw \
makefile.mingw.in \
makefile.msc \
gimp.rc \
gimp.sym \
......
## Process this file with automake to produce Makefile.in
if PLATFORM_WIN32
no_undefined = -no-undefined
conditional_libgimpbase_la = ../libgimpbase/libgimpbase-1.3.la
conditional_libgimpcolor_la = ../libgimpcolor/libgimpcolor-1.3.la
conditional_libgimpwidgets_la = ../libgimpwidgets/libgimpwidgets-1.3.la
conditional_libgimp_la = libgimp-1.3.la
endif
if OS_WIN32
gimp_def = gimp.def
gimpui_def = gimpui.def
libgimp_export_symbols = -export-symbols gimp.def
libgimpui_export_symbols = -export-symbols gimpui.def
install-libtool-import-lib:
$(INSTALL) .libs/libgimp-1.3.dll.a $(DESTDIR)$(libdir)
$(INSTALL) .libs/libgimpui-1.3.dll.a $(DESTDIR)$(libdir)
uninstall-libtool-import-lib:
-rm $(DESTDIR)$(libdir)/libgimp-1.3.dll.a
-rm $(DESTDIR)$(libdir)/libgimpui-1.3.dll.a
else
install-libtool-import-lib:
uninstall-libtool-import-lib:
endif
if MS_LIB_AVAILABLE
noinst_DATA = gimp-1.3.lib gimpui-1.3.lib
install-ms-lib:
$(INSTALL) gimp-1.3.lib $(DESTDIR)$(libdir)
$(INSTALL) gimpui-1.3.lib $(DESTDIR)$(libdir)
uninstall-ms-lib:
-rm $(DESTDIR)$(libdir)/gimp-1.3.lib
-rm $(DESTDIR)$(libdir)/gimpui-1.3.lib
gimp-1.3.lib: gimp.def
lib -name:libgimp-1.3-@LT_CURRENT_MINUS_AGE@.dll -def:gimp.def -out:$@
gimpui-1.3.lib: gimpui.def
lib -name:libgimpui-1.3-@LT_CURRENT_MINUS_AGE@.dll -def:gimpui.def -out:$@
else
install-ms-lib:
uninstall-ms-lib:
endif
gimpincludedir = $(includedir)/gimp-$(LT_RELEASE)/libgimp
AM_CPPFLAGS = \
......@@ -12,8 +60,6 @@ INCLUDES = \
-I$(includedir)
EXTRA_DIST = \
makefile.mingw \
makefile.mingw.in \
makefile.msc \
gimp.def \
gimpui.def
......@@ -165,11 +211,23 @@ gimpinclude_HEADERS = \
gimpmenu.h
libgimp_1_3_la_LDFLAGS = \
-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
$(no_undefined) \
$(libgimp_export_symbols)
libgimp_1_3_la_LIBADD = $(conditional_libgimpbase_la) $(conditional_libgimpcolor_la) $(GLIB_LIBS)
libgimp_1_3_la_LIBADD = $(GLIB_LIBS)
libgimp_1_3_la_DEPENDENCIES = $(gimp_def)
libgimpui_1_3_la_LDFLAGS = \
-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
$(no_undefined) \
$(libgimpui_export_symbols)
libgimpui_1_3_la_LIBADD = $(conditional_libgimp_la) $(conditional_libgimpbase_la) $(conditional_libgimpwidgets_la) $(GTK_LIBS)
libgimpui_1_3_la_DEPENDENCIES = $(gimpui_def)
install-data-local: install-ms-lib install-libtool-import-lib
libgimpui_1_3_la_LIBADD = $(GTK_LIBS)
uninstall-local: uninstall-ms-lib uninstall-libtool-import-lib
......@@ -77,6 +77,10 @@
# include <fcntl.h>
#endif
#ifndef LIBGIMP_COMPILATION
#define LIBGIMP_COMPILATION
#endif
#include "libgimpbase/gimpbasetypes.h"
#include "libgimpbase/gimpenv.h"
......@@ -187,7 +191,7 @@ gimp_main (int argc,
{
k = strlen (argv[i]);
if (k > 10)
if (g_strcasecmp (argv[i] + k - 4, ".exe") == 0)
if (g_ascii_strcasecmp (argv[i] + k - 4, ".exe") == 0)
{
/* Found the end of the executable name, most probably.
* Splice the parts of the name back together.
......
EXPORTS
_readchannel
gimp_airbrush
gimp_airbrush_default
gimp_attach_new_parasite
......
......@@ -44,7 +44,7 @@
#include <libgimp/gimp_pdb.h>
#ifdef G_OS_WIN32
# include <stdlib.h> /* For _-argc and __argv */
# include <stdlib.h> /* For __argc and __argv */
# ifdef LIBGIMP_COMPILATION
# define GIMPVAR __declspec(dllexport)
# else /* !LIBGIMP_COMPILATION */
......
################################
#
# Seriously out-of-date. Only Unix-style build supported now for gcc on Win32.
#
################################
## Makefile for building the GIMP DLLs and LIBs with gcc on Win32.
## You should use GNU make running on cygwin.
## Use: make -f makefile.mingw
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment