From 1cffa15b8e38c03e36075a0e727d7fe6a136261b Mon Sep 17 00:00:00 2001 From: Stefan Neis Date: Sun, 13 Feb 2005 23:09:33 +0000 Subject: [PATCH] Added support for current version of "emxomf". git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32020 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/os2/dllar.sh | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/src/os2/dllar.sh b/src/os2/dllar.sh index 66e1e8096e..32352cebbd 100644 --- a/src/os2/dllar.sh +++ b/src/os2/dllar.sh @@ -405,6 +405,8 @@ 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" ;; esac @@ -466,7 +468,17 @@ if [ $flag_USE_LXLITE -ne 0 ]; then fi doCommand "lxlite -cs -t: -mrn -mln $add_flags $dllFile" 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 -- 2.45.2