Commit 78aa8b7d authored by Dom Lachowicz's avatar Dom Lachowicz

cygwin (win32) dll/link fixes

parent 90a67959
2003-04-03 Dom Lachowicz <cinamod@hotmail.com>
* configure.in: Fixes so that we link and build a DLL on Cygwin.
Adapted from work by Masahiro Sakai <s01397ms at sfc.keio.ac.jp>
(http://web.sfc.keio.ac.jp/~s01397ms/cygwin/librsvg-2.2.3-1.patch)
* Makefile.am: Ditto
* gtk-engine/Makefile.am: Ditto
* gimp-plugin/Makefile.am: Ditto
2003-04-02 Frederic Crozat <fcrozat@mandrakesoft.com>
* configure.in: use correct name for libcroco in .pc file
......
......@@ -6,6 +6,10 @@ noinst_PROGRAMS = test-performance test-display
man_MANS = rsvg.1
if PLATFORM_WIN32
no_undefined = -no-undefined
endif
if WITH_LIBGSF
GSFHEADERS = rsvg-gz.h
GSFSOURCES = rsvg-gz.c
......@@ -46,7 +50,8 @@ librsvg_2_la_SOURCES = $(GSFSOURCES) \
rsvg-text.h \
rsvg.c
librsvg_2_la_LDFLAGS = -version-info @VERSION_INFO@
librsvg_2_la_LDFLAGS = -version-info @VERSION_INFO@ $(no_undefined)
librsvg_2_la_LIBADD = $(LIBRSVG_LIBS)
librsvgincdir = $(includedir)/librsvg-2/librsvg
librsvginc_HEADERS = $(GSFHEADERS) \
......
......@@ -41,6 +41,7 @@ AC_ISC_POSIX
AC_PROG_CC
AC_PROG_CPP
AC_PROG_AWK
AC_LIBTOOL_WIN32_DLL
AM_PROG_LIBTOOL
AC_STDC_HEADERS
......@@ -50,6 +51,22 @@ GNOME_REQUIRE_PKGCONFIG
dnl ===========================================================================
#AC_CANONICAL_HOST
AC_MSG_CHECKING([for some Win32 platform])
case "$host" in
*-*-mingw*|*-*-cygwin*)
platform_win32=yes
;;
*)
platform_win32=no
;;
esac
AC_MSG_RESULT([$platform_win32])
AM_CONDITIONAL(PLATFORM_WIN32, test "$platform_win32" = "yes")
dnl ===========================================================================
PKG_CHECK_MODULES(LIBRSVG, \
gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED \
glib-2.0 >= $GLIB_REQUIRED \
......
loaderdir = $(libdir)/gtk-2.0/$(GTK_VERSION)/loaders
if PLATFORM_WIN32
no_undefined = -no-undefined
endif
INCLUDES = \
$(LIBRSVG_CFLAGS) \
$(LIBGSF_CFLAGS) \
......@@ -15,7 +19,7 @@ target_pixbuf_loader =
endif
svg_loader_la_SOURCES = io-svg.c
svg_loader_la_LDFLAGS = -avoid-version -module
svg_loader_la_LDFLAGS = -avoid-version -module $(no_undefined)
svg_loader_la_LIBADD = $(LIBRSVG_LIBS) \
$(LIBGSF_LIBS) \
$(top_builddir)/librsvg-2.la
......
gimpdir = $(libdir)/gimp/1.3/plug-ins
if PLATFORM_WIN32
no_undefined = -no-undefined
endif
INCLUDES = $(GTK_CFLAGS)\
$(LIBRSVG_CFLAGS) \
$(LIBGIMP_CFLAGS) \
......@@ -20,7 +24,7 @@ LDADDS =$(LIBGSF_LIBS)\
$(LIBRSVG_LIBS)
svg_SOURCES=svg.c
svg_LDFLAGS = -avoid-version -module
svg_LDFLAGS = -avoid-version -module $(no_undefined)
svg_DEPENDENCIES = $(DEPS)
svg_LDADD = $(LDADDS) -lm
......
DIST_SUBDIRS= examples
if PLATFORM_WIN32
no_undefined = -no-undefined
endif
INCLUDES = $(GTK_CFLAGS) $(LIBGSF_CFLAGS) $(LIBCROCO_CFLAGS) $(LIBRSVG_CFLAGS) -I$(top_srcdir)
enginedir = $(libdir)/gtk-2.0/$(GTK_VERSION)/engines
......@@ -24,5 +28,5 @@ libsvg_la_SOURCES = \
svg-style.h \
svg.h
libsvg_la_LDFLAGS = -avoid-version -module
libsvg_la_LIBADD = $(GTK_LIBS) $(LIBRSVG_LIBS) $(LIBGSF_LIBS) $(LIBCROCO_LIBS)
libsvg_la_LDFLAGS = -avoid-version -module $(no_undefined)
libsvg_la_LIBADD = $(GTK_LIBS) $(LIBRSVG_LIBS) $(top_builddir)/librsvg-2.la
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