diff --git a/sdk/install b/sdk/install index d9a6283..41a3e35 100755 --- a/sdk/install +++ b/sdk/install @@ -50,6 +50,7 @@ case $1 in file=$(basename $sfd) name=${file%????} mkdir -p $3/m68k-amigaos/include/proto/ + rm $3/m68k-amigaos/include/proto/$name.h $3/bin/sfdc --mode=proto --target=m68k-amigaos --output=$3/m68k-amigaos/include/proto/$name.h $3/m68k-amigaos/lib/sfd/$sfd || exit 1 sed -i.bak -e 's/\(\)/\L\1/' -e 's/\(\)/\L\1/' -e 's/\(\)/\L\1/' -e 's/\(\)/\L\1/' $3/m68k-amigaos/include/proto/$name.h rm $3/m68k-amigaos/include/proto/$name.h.bak @@ -72,6 +73,7 @@ case $1 in name=${file%????} $3/bin/sfdc --mode=autoopen --target=m68k-amigaos --output=build/$2/$name.c $3/m68k-amigaos/lib/sfd/$name.sfd || exit 1 sed -i.bak -e 's/__inline//g' -e 's/: \"d0\",/:/g' build/$2/$name.c || exit 1 + rm build/$2/$name.c.bak echo $3/bin/m68k-amigaos-gcc -Os -noixemul -fomit-frame-pointer build/$2/$name.c -c $3/bin/m68k-amigaos-gcc -Os -noixemul -fomit-frame-pointer build/$2/$name.c -c -o build/$2/$name.o || exit 1 echo $3/bin/m68k-amigaos-ar r $3/m68k-amigaos/lib/libstubs.a build/$2/$name.o @@ -87,6 +89,7 @@ case $1 in name=${file%????} $3/bin/sfdc --mode=stubs --target=m68k-amigaos --output=build/$2/lib$2.c $3/m68k-amigaos/lib/sfd/$name.sfd || exit 1 sed -i.bak -e 's/__inline//g' -e 's/: \"d0\",/:/g' build/$2/lib$2.c || exit 1 + rm build/$2/lib$2.c.bak echo $3/bin/m68k-amigaos-gcc -Os -noixemul -fomit-frame-pointer build/$2/lib$2.c -c $3/bin/m68k-amigaos-gcc -Os -noixemul -fomit-frame-pointer build/$2/lib$2.c -c -o build/$2/lib$2.o || exit 1 echo $3/bin/m68k-amigaos-ar r $3/m68k-amigaos/lib/lib$2.a build/$2/lib$2.o @@ -97,11 +100,12 @@ case $1 in echo "#include \"${a[2]}\"" >$3/m68k-amigaos/include/${a[1]} ;; sed) - echo applying: sed -i.bak -E "${a[@]:2}" $3/${a[1]} x=${a[@]:2} x=${x##\"} x=${x%%\"} + echo applying: sed -i.bak -E \""$x"\" $3/${a[1]} LC_CTYPE=C sed -i.bak -E "$x" $3/${a[1]} + rm $3/${a[1]}.bak ;; symlink) echo creating symlink from $3/m68k-amigaos/${a[2]} to $3/m68k-amigaos/${a[1]} diff --git a/sdk/mui.sdk b/sdk/mui.sdk index bbd9a8c..799b3a0 100644 --- a/sdk/mui.sdk +++ b/sdk/mui.sdk @@ -113,5 +113,5 @@ sfdc : muimaster_lib.sfd muimaster.h muimaster_lib.h stubs : muimaster_lib.sfd lib : muimaster_lib.sfd patch : SDK/MUI/C/include/libraries/mui.h -sed : m68k-amigaos/include/proto/muimaster.h "s/(# include )/#define NO_INLINE_STDARG\n#define NO_INLINE_VARARGS\n\1/g" -sed : m68k-amigaos/include/proto/muimaster_lib.h "s/(# include )/#define NO_INLINE_STDARG\n#define NO_INLINE_VARARGS\n\1/g" +sed : m68k-amigaos/include/proto/muimaster_lib.h "s/(#\s+include )/#define NO_INLINE_STDARG\n#define NO_INLINE_VARARGS\n\1\n#undef NO_INLINE_STDARG\n#undef NO_INLINE_VARARGS\n/g" +symlink: include/proto/muimaster_lib.h include/proto/muimaster.h \ No newline at end of file