diff options
| author | Romain Chantereay <rchantereau@entrouvert.com> | 2004-09-07 17:07:59 +0000 |
|---|---|---|
| committer | Romain Chantereay <rchantereau@entrouvert.com> | 2004-09-07 17:07:59 +0000 |
| commit | ce352716fd2c3ae3ff7a20c7f56b79b0d1c97638 (patch) | |
| tree | 19f78a195618664f066310bf15dad7182dd04814 | |
| parent | 9388bdfc57a3b49adafc1693d21975214e63a691 (diff) | |
| download | lasso-ce352716fd2c3ae3ff7a20c7f56b79b0d1c97638.tar.gz lasso-ce352716fd2c3ae3ff7a20c7f56b79b0d1c97638.tar.xz lasso-ce352716fd2c3ae3ff7a20c7f56b79b0d1c97638.zip | |
Add windows linker --add-stdcall-alias in order to permit failsafe use of DLLs.
| -rw-r--r-- | java/Makefile.am | 3 | ||||
| -rw-r--r-- | lasso/Makefile.am | 9 | ||||
| -rw-r--r-- | python/Makefile.am | 4 |
3 files changed, 13 insertions, 3 deletions
diff --git a/java/Makefile.am b/java/Makefile.am index 0e746b30..9e959ba7 100644 --- a/java/Makefile.am +++ b/java/Makefile.am @@ -16,7 +16,8 @@ endif jlasso_la_SOURCES = lasso_wrap.c jlasso_la_CFLAGS = $(JDK_INCLUDES) $(LASSO_CFLAGS) -I$(top_srcdir) jlasso_la_LIBADD = $(top_builddir)/lasso/liblasso.la $(LASSO_LIBS) -jlasso_la_LDFLAGS = -no-undefined -avoid-version -module +jlasso_la_LDFLAGS = -no-undefined -avoid-version -module \ + -Wl,--add-stdcall-alias libjlasso_la_SOURCES = lasso_wrap.c libjlasso_la_CFLAGS = $(JDK_INCLUDES) $(LASSO_CFLAGS) -I$(top_srcdir) diff --git a/lasso/Makefile.am b/lasso/Makefile.am index 6a1f8f2d..6adee84b 100644 --- a/lasso/Makefile.am +++ b/lasso/Makefile.am @@ -30,16 +30,21 @@ liblasso_la_LIBADD = \ $(top_builddir)/lasso/environs/liblasso-environs.la \ $(LASSO_LIBS) \ lasso.rc.lo +# Just make damn sure the ABI stays the same between +# upgrades. +# Obviously if you don't, fixing the situation up again can be painful. +liblasso_la_LDFLAGS = -no-undefined -version-info @LASSO_VERSION_INFO@ \ + -Wl,--add-stdcall-alias else liblasso_la_LIBADD = \ $(top_builddir)/lasso/xml/liblasso-xml.la \ $(top_builddir)/lasso/protocols/liblasso-protocols.la \ $(top_builddir)/lasso/environs/liblasso-environs.la \ $(LASSO_LIBS) -endif - # Just make damn sure the ABI stays the same between # upgrades. # Obviously if you don't, fixing the situation up again can be painful. liblasso_la_LDFLAGS = -no-undefined -version-info @LASSO_VERSION_INFO@ +endif + diff --git a/python/Makefile.am b/python/Makefile.am index 273c99a3..0e063e1e 100644 --- a/python/Makefile.am +++ b/python/Makefile.am @@ -10,8 +10,12 @@ _lasso_la_LIBADD = $(top_builddir)/lasso/liblasso.la $(LASSO_LIBS) if DARWIN _lasso_la_LDFLAGS = -no-undefined -module -avoid-version -Wl,-F. -Wl,-F. -bundle -framework Python else +if MINGW +_lasso_la_LDFLAGS = -no-undefined -module -avoid-version -Wl,--add-stdcall-alias +else _lasso_la_LDFLAGS = -no-undefined -module -avoid-version endif +endif lasso_wrap.c lasso.py: $(top_srcdir)/swig/Lasso.i $(SWIG) -v -python -module lasso -o lasso_wrap.c $< |