Add windows linker --add-stdcall-alias in order to permit failsafe use of DLLs.
This commit is contained in:
parent
9388bdfc57
commit
ce352716fd
|
@ -16,7 +16,8 @@ endif
|
||||||
jlasso_la_SOURCES = lasso_wrap.c
|
jlasso_la_SOURCES = lasso_wrap.c
|
||||||
jlasso_la_CFLAGS = $(JDK_INCLUDES) $(LASSO_CFLAGS) -I$(top_srcdir)
|
jlasso_la_CFLAGS = $(JDK_INCLUDES) $(LASSO_CFLAGS) -I$(top_srcdir)
|
||||||
jlasso_la_LIBADD = $(top_builddir)/lasso/liblasso.la $(LASSO_LIBS)
|
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_SOURCES = lasso_wrap.c
|
||||||
libjlasso_la_CFLAGS = $(JDK_INCLUDES) $(LASSO_CFLAGS) -I$(top_srcdir)
|
libjlasso_la_CFLAGS = $(JDK_INCLUDES) $(LASSO_CFLAGS) -I$(top_srcdir)
|
||||||
|
|
|
@ -30,16 +30,21 @@ liblasso_la_LIBADD = \
|
||||||
$(top_builddir)/lasso/environs/liblasso-environs.la \
|
$(top_builddir)/lasso/environs/liblasso-environs.la \
|
||||||
$(LASSO_LIBS) \
|
$(LASSO_LIBS) \
|
||||||
lasso.rc.lo
|
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
|
else
|
||||||
liblasso_la_LIBADD = \
|
liblasso_la_LIBADD = \
|
||||||
$(top_builddir)/lasso/xml/liblasso-xml.la \
|
$(top_builddir)/lasso/xml/liblasso-xml.la \
|
||||||
$(top_builddir)/lasso/protocols/liblasso-protocols.la \
|
$(top_builddir)/lasso/protocols/liblasso-protocols.la \
|
||||||
$(top_builddir)/lasso/environs/liblasso-environs.la \
|
$(top_builddir)/lasso/environs/liblasso-environs.la \
|
||||||
$(LASSO_LIBS)
|
$(LASSO_LIBS)
|
||||||
endif
|
|
||||||
|
|
||||||
# Just make damn sure the ABI stays the same between
|
# Just make damn sure the ABI stays the same between
|
||||||
# upgrades.
|
# upgrades.
|
||||||
# Obviously if you don't, fixing the situation up again can be painful.
|
# Obviously if you don't, fixing the situation up again can be painful.
|
||||||
liblasso_la_LDFLAGS = -no-undefined -version-info @LASSO_VERSION_INFO@
|
liblasso_la_LDFLAGS = -no-undefined -version-info @LASSO_VERSION_INFO@
|
||||||
|
endif
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -10,8 +10,12 @@ _lasso_la_LIBADD = $(top_builddir)/lasso/liblasso.la $(LASSO_LIBS)
|
||||||
if DARWIN
|
if DARWIN
|
||||||
_lasso_la_LDFLAGS = -no-undefined -module -avoid-version -Wl,-F. -Wl,-F. -bundle -framework Python
|
_lasso_la_LDFLAGS = -no-undefined -module -avoid-version -Wl,-F. -Wl,-F. -bundle -framework Python
|
||||||
else
|
else
|
||||||
|
if MINGW
|
||||||
|
_lasso_la_LDFLAGS = -no-undefined -module -avoid-version -Wl,--add-stdcall-alias
|
||||||
|
else
|
||||||
_lasso_la_LDFLAGS = -no-undefined -module -avoid-version
|
_lasso_la_LDFLAGS = -no-undefined -module -avoid-version
|
||||||
endif
|
endif
|
||||||
|
endif
|
||||||
lasso_wrap.c lasso.py: $(top_srcdir)/swig/Lasso.i
|
lasso_wrap.c lasso.py: $(top_srcdir)/swig/Lasso.i
|
||||||
$(SWIG) -v -python -module lasso -o lasso_wrap.c $<
|
$(SWIG) -v -python -module lasso -o lasso_wrap.c $<
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue