Corrects unresolved import due to missing static link for MsOutlook plugin.

13 years ago · acf21bb2a4
parent 7850999c10
commit acf21bb2a4
7 changed files with 3 additions and 0 deletions
--- a/lib/native/windows-64/jmsoutlookaddrbook.dll
+++ b/lib/native/windows-64/jmsoutlookaddrbook.dll
--- a/lib/native/windows-64/jmsoutlookaddrbookcomserver32.exe
+++ b/lib/native/windows-64/jmsoutlookaddrbookcomserver32.exe
--- a/lib/native/windows-64/jmsoutlookaddrbookcomserver64.exe
+++ b/lib/native/windows-64/jmsoutlookaddrbookcomserver64.exe
--- a/lib/native/windows/jmsoutlookaddrbook.dll
+++ b/lib/native/windows/jmsoutlookaddrbook.dll
--- a/lib/native/windows/jmsoutlookaddrbookcomserver32.exe
+++ b/lib/native/windows/jmsoutlookaddrbookcomserver32.exe
--- a/lib/native/windows/jmsoutlookaddrbookcomserver64.exe
+++ b/lib/native/windows/jmsoutlookaddrbookcomserver64.exe
--- a/src/native/build.xml
+++ b/src/native/build.xml
@ -873,6 +873,7 @@
      <linkerarg value="-m64" if="cross_64" />
      <linkerarg value="-Wl,--kill-at" />
      <linkerarg value="-Wl,--subsystem,windows" />
+      <linkerarg value="-Wl,-Bstatic" location="end" if="is.running.windows" />
      <libset libs="advapi32, uuid, ole32, oleaut32, msi, stdc++" />

      <fileset dir="${src}/native/addrbook" includes="*.c" />
@ -910,6 +911,7 @@

      <linkerarg value="-ojmsoutlookaddrbookcomserver32.exe" />
      <linkerarg value="-m32" />
+      <linkerarg value="-Wl,-Bstatic" location="end" if="is.running.windows" />
      <libset libs="uuid, ole32, oleaut32, msi, stdc++" />

      <fileset dir="${src}/native/addrbook/msoutlook" includes="*.cxx" />
@ -934,6 +936,7 @@

      <linkerarg value="-ojmsoutlookaddrbookcomserver64.exe" />
      <linkerarg value="-m64" />
+      <linkerarg value="-Wl,-Bstatic" location="end" if="is.running.windows" />
      <libset libs="uuid, ole32, oleaut32, msi, stdc++" />

      <fileset dir="${src}/native/addrbook/msoutlook" includes="*.cxx" />