AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed some problems in converting existing static libs into DLLs.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26152 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Neis 2004-03-09 22:34:28 +00:00
parent bd5e3a811e
commit 60848fcfef
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/os2/dllar.sh
View File

@ -86,7 +86,7 @@ CleanUp() {
# Kill result in case of failure as there is just to many stupid make/nmake # Kill result in case of failure as there is just to many stupid make/nmake
# things out there which doesn't do this. # things out there which doesn't do this.
if [ $# -eq 0 ]; then if [ $# -eq 0 ]; then
rm -f $arcFile $defFile $dllFile rm -f $arcFile $arcFile2 $defFile $dllFile
fi fi
} }
@ -265,6 +265,7 @@ for file in $inputFiles ; do
*.lib) *.lib)
suffix=".lib" suffix=".lib"
AR="emxomfar" AR="emxomfar"
EXTRA_CFLAGS="$EXTRA_CFLAGS -Zomf"
;; ;;
*) *)
;; ;;
@ -281,12 +282,12 @@ for file in $inputFiles ; do
doCommand "cd $dirname; $AR x ../$file" doCommand "cd $dirname; $AR x ../$file"
cd $curDir cd $curDir
found=0; found=0;
for subfile in $dirname/*.o ; do for subfile in $dirname/*.o* ; do
if [ -f $subfile ]; then if [ -f $subfile ]; then
found=1 found=1
if [ -s $subfile ]; then if [ -s $subfile ]; then
# FIXME: This should be: is file size > 32 byte, _not_ > 0! # FIXME: This should be: is file size > 32 byte, _not_ > 0!
newInputFiles="$newInputFiles $subname" newInputFiles="$newInputFiles $subfile"
fi fi
fi fi
done done
@ -340,6 +341,7 @@ case $outFile in
esac esac
defFile="${outFile}.def" defFile="${outFile}.def"
arcFile="${outFile}.a" arcFile="${outFile}.a"
arcFile2="${outFile}.lib"
#create $dllFile as something matching 8.3 restrictions, #create $dllFile as something matching 8.3 restrictions,
dllFile="$outFile" dllFile="$outFile"
@ -356,8 +358,13 @@ esac
dllFile="`echo $dllFile | sed 's/\.//' | sed 's/_//' | sed 's/-//'`" dllFile="`echo $dllFile | sed 's/\.//' | sed 's/_//' | sed 's/-//'`"
if [ $do_backup -ne 0 -a -f $arcFile ] ; then if [ $do_backup -ne 0 ] ; then
doCommand "mv $arcFile ${outFile}_s.a" if [ -f $arcFile ] ; then
doCommand "mv $arcFile ${outFile}_s.a"
fi
if [ -f $arcFile2 ] ; then
doCommand "mv $arcFile2 ${outFile}_s.lib"
fi
fi fi
# Extract public symbols from all the object files. # Extract public symbols from all the object files.