respect wxBU_NOTEXT style in wxButton

[wxWidgets.git] / src / os2 / dllar.sh

diff --git a/src/os2/dllar.sh b/src/os2/dllar.sh
index 99463171d9c796a8216101740c9a49cb0b10d69a..2dd495b9b6fb674517cd275e47248234c45c3035 100644 (file)
--- a/src/os2/dllar.sh
+++ b/src/os2/dllar.sh
@@ -405,7 +405,9 @@ for file in $inputFiles ; do
     *!)
         ;;
     *)
     *!)
         ;;
     *)

-        doCommand "emxexp -u $file >> $tmpdefFile"
+        # 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
         ;;
     esac
 done


@@ -464,9 +466,19 @@ if [ $flag_USE_LXLITE -ne 0 ]; then
     if [ $EXPORT_BY_ORDINALS -ne 0 ]; then
         add_flags="-ynd"
     fi
     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
 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
 
 # Successful exit.
 CleanUp 1