X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f8dc67b68519f4244e9d1350c6c4b64b95ab9429..8d5016b18bfaee2f1694e386a7dff89868a03b6d:/src/os2/dllar.sh

diff --git a/src/os2/dllar.sh b/src/os2/dllar.sh
index 66e1e8096e..2dd495b9b6 100644
--- a/src/os2/dllar.sh
+++ b/src/os2/dllar.sh
@@ -405,7 +405,9 @@ for file in $inputFiles ; do
     *!)
         ;;
     *)
-        doCommand "emxexp -u $file | grep -v weak$ >> $tmpdefFile || true"
+        # we do not want to export weak symbols in general, so we filter
+        # those out using grep.
+        doCommand "emxexp -u $file >> $tmpdefFile || true"
         ;;
     esac
 done
@@ -464,9 +466,19 @@ if [ $flag_USE_LXLITE -ne 0 ]; then
     if [ $EXPORT_BY_ORDINALS -ne 0 ]; then
         add_flags="-ynd"
     fi
-    doCommand "lxlite -cs -t: -mrn -mln $add_flags $dllFile"
+    doCommand "lxlite -cs -t: $add_flags `echo $dllFile | sed 's/\//\\\\/g'`"
 fi
-doCommand "emxomf -s -l $arcFile"
+
+#New version of emxomf do no longer want the "-l" flag
+case `emxomf` in
+emxomf\ 0.6*)
+    omflibflag=""
+    ;;
+*)
+    omflibflag=" -l"
+    ;;
+esac
+doCommand "emxomf -s$omflibflag $arcFile"
 
 # Successful exit.
 CleanUp 1