Force OMF mode for DLL builds.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32029 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/configure.in b/configure.in
index a85b48fc4b123bee802b90b3b61b0bdd0105c759..29564680919ad136d6b0831cbaf55f404af5160d 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1559,6 +1559,10 @@ case "${host}" in
               LIBS="$LIBS -lstdc++"
           fi
       fi
+      if test "$wxUSE_SHARED" = "yes" -a "$wxUSE_OMF" = "no"; then
+        AC_MSG_WARN([Building DLLs requires OMF mode, enabled])
+        wxUSE_OMF=yes
+      fi
       if test "$wxUSE_OMF" = "yes"; then
         LDFLAGS="$LDFLAGS -Zomf -Zlinker /PMTYPE:PM -Zlinker /EXEPACK"
       fi

diff --git a/src/os2/dllar.sh b/src/os2/dllar.sh
index 32352cebbd6501a831c47f5031cd55388365ce99..652c940fd1bb8db20cc15eb5b25393f73a2251d1 100644 (file)
--- a/src/os2/dllar.sh
+++ b/src/os2/dllar.sh
@@ -407,7 +407,7 @@ for file in $inputFiles ; do
     *)
         # we do not want to export weak symbols in general, so we filter
         # those out using grep.
-        doCommand "emxexp -u $file | grep -v weak$ >> $tmpdefFile || true"
+        doCommand "emxexp -u $file >> $tmpdefFile || true"
         ;;
     esac
 done