From 27d74cc3579ef35cc5962d74677a0b6bcdafa085 Mon Sep 17 00:00:00 2001 From: mheyer Date: Fri, 22 Feb 2019 23:40:03 -0800 Subject: [PATCH 1/5] proto/guigfx_lib.h and proto/muimaster_lib.h referred to wrong inlines proto/guigfx_lib.h was referring to non-existent inline/guigfx.h proto/muimaster_lib.h was referring to non-existent inline/muimaster.h Let the sfdc pass replace the broken filenames with the real ones --- sdk/guigfx.sdk | 2 +- sdk/mui.sdk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk/guigfx.sdk b/sdk/guigfx.sdk index 90ba144..d786777 100644 --- a/sdk/guigfx.sdk +++ b/sdk/guigfx.sdk @@ -9,5 +9,5 @@ include/fd/guigfx_lib.fd include/guigfx/guigfx.h include/pragmas/guigfx_pragmas.h fd2sfd : guigfx_lib.fd clib/guigfx_protos.h -sfdc : guigfx_lib.sfd +sfdc : guigfx_lib.sfd guigfx.h guigfx_lib.h stubs : guigfx_lib.sfd diff --git a/sdk/mui.sdk b/sdk/mui.sdk index d86ac90..cf83f2f 100644 --- a/sdk/mui.sdk +++ b/sdk/mui.sdk @@ -108,6 +108,6 @@ SDK/MUI/C/lib/libmui.a SDK/MUI/fd/muimaster_lib.fd SDK/MUI/sfd/muimaster_lib.sfd fd2sfd : muimaster_lib.fd clib/muimaster_protos.h -sfdc : muimaster_lib.sfd +sfdc : muimaster_lib.sfd muimaster.h muimaster_lib.h stubs : muimaster_lib.sfd lib : muimaster_lib.sfd From 18927431180498e3a9baa680a98c25e1ef7e3a66 Mon Sep 17 00:00:00 2001 From: mheyer Date: Fri, 22 Feb 2019 23:40:38 -0800 Subject: [PATCH 2/5] add Guigfx_MCC to SDKs --- sdk/mcc_guigfx.sdk | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 sdk/mcc_guigfx.sdk diff --git a/sdk/mcc_guigfx.sdk b/sdk/mcc_guigfx.sdk new file mode 100644 index 0000000..3e0a4e2 --- /dev/null +++ b/sdk/mcc_guigfx.sdk @@ -0,0 +1,7 @@ +Short: Guigfx MUI custom class +Version: 19.2 +Url: http://aminet.net/dev/mui/MCC_Guigfx.lha + +MCC_Guigfx/Developer/Assembler/Include/MUI/Guigfx_mcc.i +MCC_Guigfx/Developer/C/Include/MUI/Guigfx_mcc.h +MCC_Guigfx/Developer/AutoDocs/Guigfx_mcc.doc = MCC_Guigfx.doc From 93641e9de7843c7791129cdc7f9af53db6bf8218 Mon Sep 17 00:00:00 2001 From: mheyer Date: Fri, 22 Feb 2019 23:44:38 -0800 Subject: [PATCH 3/5] unify all SDK include paths to lower case Guigfx_MCC was referring to include/MUI instead of include/mui, producing two distinct mui/MUI paths in our include directory. This will also affect the former include/Warp3D path which now becomes include/warp3d . --- sdk/install | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/sdk/install b/sdk/install index b31af18..e8498ff 100755 --- a/sdk/install +++ b/sdk/install @@ -117,11 +117,13 @@ case $1 in fi dir=$(basename $(dirname $line)) + #lower-case the directory part + outdir=${dir,,} if [[ $file == *.h ]] || [[ $file == *.i ]]; then - mkdir -p "$3/m68k-amigaos/include/$dir" - echo cp "build/$2/$line" "$3/m68k-amigaos/include/$dir/$file" - cp "build/$2/$line" "$3/m68k-amigaos/include/$dir/$file" + mkdir -p "$3/m68k-amigaos/include/$outdir" + echo cp "build/$2/$line" "$3/m68k-amigaos/include/$outdir/$file" + cp "build/$2/$line" "$3/m68k-amigaos/include/$outdir/$file" elif [[ $file == *.guide ]]; then mkdir -p "$3/m68k-amigaos/guide" echo cp "build/$2/$line" "$3/m68k-amigaos/guide/$file" From 4adbd8ad36019c4048e4e89393c52309c0c8f645 Mon Sep 17 00:00:00 2001 From: mheyer Date: Sun, 24 Feb 2019 21:59:21 -0800 Subject: [PATCH 4/5] Redirect .i LVO files to include/lvo --- sdk/install | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sdk/install b/sdk/install index e8498ff..261480a 100755 --- a/sdk/install +++ b/sdk/install @@ -57,14 +57,14 @@ case $1 in mkdir -p $3/m68k-amigaos/include/inline/ $3/bin/sfdc --mode=macros --target=m68k-amigaos --output=$3/m68k-amigaos/include/inline/$name.h $3/m68k-amigaos/lib/sfd/$sfd || exit 1 mkdir -p $3/m68k-amigaos/include/lvo/ - $3/bin/sfdc --mode=lvo --target=m68k-amigaos --output=$3/m68k-amigaos/include/proto/$name.i $3/m68k-amigaos/lib/sfd/$sfd || exit 1 + $3/bin/sfdc --mode=lvo --target=m68k-amigaos --output=$3/m68k-amigaos/include/lvo/$name.i $3/m68k-amigaos/lib/sfd/$sfd || exit 1 if [ "${a[2]}" != "" ] && [ "${a[3]}" != "" ]; then echo fixup names from ${a[2]} to ${a[3]} echo sed -i.bak -e "s/${a[2]}/${a[3]}/" $3/m68k-amigaos/include/proto/$name.h sed -i.bak -e "s/${a[2]}/${a[3]}/" $3/m68k-amigaos/include/proto/$name.h - sed -i.bak -e "s/${a[2]}/${a[3]}/" $3/m68k-amigaos/include/proto/$name.i + sed -i.bak -e "s/${a[2]}/${a[3]}/" $3/m68k-amigaos/include/lvo/$name.i sed -i.bak -e "s/${a[2]}/${a[3]}/" $3/m68k-amigaos/include/inline/$name.h - rm $3/m68k-amigaos/include/proto/$name.h.bak $3/m68k-amigaos/include/proto/$name.i.bak $3/m68k-amigaos/include/inline/$name.h.bak + rm $3/m68k-amigaos/include/proto/$name.h.bak $3/m68k-amigaos/include/lvo/$name.i.bak $3/m68k-amigaos/include/inline/$name.h.bak fi ;; stubs) From 0ac23dd17a644a317e16786bff4ad8dbf1d512a4 Mon Sep 17 00:00:00 2001 From: mheyer Date: Sun, 24 Feb 2019 21:58:50 -0800 Subject: [PATCH 5/5] Add CAMD to SDK There isno official CAMD SDK on Aminet, so use the MorphOS headers and regenerate the GCC inlines from the clib/camd_protos.h and .fd file. --- sdk/camd.sdk | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 sdk/camd.sdk diff --git a/sdk/camd.sdk b/sdk/camd.sdk new file mode 100644 index 0000000..ed45dd1 --- /dev/null +++ b/sdk/camd.sdk @@ -0,0 +1,14 @@ +Short: CAMD developer kit for MorphOS +Version: 37.1 +Url: http://aminet.net/dev/c/camd-morphos-dev.lha + +camd/clib/camd_protos.h +camd/fd/camd_lib.fd = camd.fd +camd/midi/camd.h +camd/midi/camdbase.h +camd/midi/mididefs.h +camd/midi/midiprefs.h + +fd2sfd : camd.fd clib/camd_protos.h +sfdc : camd.sfd +stubs : camd.sfd