diff options
| -rw-r--r-- | Docs/env.sh | 4 | ||||
| -rwxr-xr-x | frontends/amiga/dist/Install | 10 | ||||
| -rw-r--r-- | frontends/amiga/gui.c | 23 | ||||
| -rw-r--r-- | frontends/amiga/os3support.c | 23 |
4 files changed, 16 insertions, 44 deletions
diff --git a/Docs/env.sh b/Docs/env.sh index a1253f034..9cfc95650 100644 --- a/Docs/env.sh +++ b/Docs/env.sh @@ -28,13 +28,13 @@ if [ "x${HOST}" = "x" ]; then fi else HOST_CC_LIST="${HOST}-cc ${HOST}-gcc /opt/netsurf/${HOST}/cross/bin/${HOST}-cc /opt/netsurf/${HOST}/cross/bin/${HOST}-gcc" - for HOST_CC_V in ${HOST_CC_LIST};do + for HOST_CC_V in $(echo ${HOST_CC_LIST});do HOST_CC=$(/bin/which ${HOST_CC_V}) if [ "x${HOST_CC}" != "x" ];then break fi done - if [ "x${HOST_CC}" == "x" ];then + if [ "x${HOST_CC}" = "x" ];then echo "Unable to execute host compiler for HOST=${HOST}. is it set correctly?" return 1 fi diff --git a/frontends/amiga/dist/Install b/frontends/amiga/dist/Install index dd4eb5149..b33b36c7b 100755 --- a/frontends/amiga/dist/Install +++ b/frontends/amiga/dist/Install @@ -289,16 +289,6 @@ (complete 75) -; Force disable use of AltiVec if we don't have it -(if (database "vectorunit" "0") - ( - (textfile - (dest "ENVARC:JSIMD_FORCENONE") - (append "1") - ) - ) -) - (if (= (exists "ENVARC:Sys/def_css.info") 0) (copyfiles (prompt "Copying default CSS icon") diff --git a/frontends/amiga/gui.c b/frontends/amiga/gui.c index fdbced232..459e768e1 100644 --- a/frontends/amiga/gui.c +++ b/frontends/amiga/gui.c @@ -5542,29 +5542,6 @@ int main(int argc, char** argv) /* Open splash window */ Object *splash_window = ami_gui_splash_open(); -#ifdef __amigaos4__ - /* Check for AltiVec */ - uint32 altivec = 0; - - GetCPUInfoTags(GCIT_VectorUnit, &altivec, TAG_DONE); - - if(altivec == VECTORTYPE_ALTIVEC) { - LOG("AltiVec detected"); - } else { - char jsimd_forcenone[10]; - - LOG("AltiVec NOT detected"); - int32 len = GetVar("JSIMD_FORCENONE", jsimd_forcenone, 10, GVF_GLOBAL_ONLY); - - if(len == -1) { - LOG("WARNING: JSIMD_FORCENONE NOT SET"); - SetVar("JSIMD_FORCENONE", "1", 1, GVF_GLOBAL_ONLY | GVF_SAVE_VAR); - } else { - LOG("JSIMD_FORCENONE = %s (NB: Should be '1' for this architecture)", jsimd_forcenone); - } - } -#endif - ami_object_init(); if (ami_open_resources() == false) { /* alloc message ports */ diff --git a/frontends/amiga/os3support.c b/frontends/amiga/os3support.c index b251448a6..6722ca83c 100644 --- a/frontends/amiga/os3support.c +++ b/frontends/amiga/os3support.c @@ -17,7 +17,7 @@ */ /** \file - * Minimal compatibility header for AmigaOS 3 + * Compatibility functions for AmigaOS 3 */ #ifndef __amigaos4__ @@ -26,6 +26,9 @@ #include <inttypes.h> #include <stdarg.h> #include <stdio.h> +#include <stdlib.h> +#include <ctype.h> +#include <dirent.h> #include <proto/bullet.h> #include <proto/exec.h> @@ -43,6 +46,8 @@ #define FAILURE (FALSE) #define NO ! +ULONG __slab_max_size = 8192; /* Enable clib2's slab allocator */ + /* Diskfont */ struct OutlineFont *OpenOutlineFont(STRPTR fileName, struct List *list, ULONG flags) { @@ -57,7 +62,7 @@ struct OutlineFont *OpenOutlineFont(STRPTR fileName, struct List *list, ULONG fl char *p = 0; struct FontContentsHeader fch; - if(p = strrchr(fileName, '.')) + if((p = strrchr(fileName, '.'))) *p = '\0'; fontpath = (STRPTR)ASPrintf("FONTS:%s.font", fileName); @@ -96,7 +101,7 @@ struct OutlineFont *OpenOutlineFont(STRPTR fileName, struct List *list, ULONG fl } size = GetFileSize(fh); - buffer = (struct TagItem *)AllocVec(size, MEMF_ANY); + buffer = (UBYTE *)AllocVec(size, MEMF_ANY); if(buffer == NULL) { LOG("Unable to allocate memory"); Close(fh); @@ -117,9 +122,9 @@ struct OutlineFont *OpenOutlineFont(STRPTR fileName, struct List *list, ULONG fl } /* Relocate all the OT_Indirect tags */ - while (ti = NextTagItem(&tag)) { + while((ti = NextTagItem(&tag))) { if(ti->ti_Tag & OT_Indirect) { - ti->ti_Data += buffer; + ti->ti_Data += (ULONG)buffer; } } @@ -134,7 +139,7 @@ struct OutlineFont *OpenOutlineFont(STRPTR fileName, struct List *list, ULONG fl return NULL; } - BulletBase = OpenLibrary(fname, 0L); + BulletBase = (struct BulletBase *)OpenLibrary(fname, 0L); if(BulletBase == NULL) { LOG("Unable to open font engine %s", fname); @@ -148,8 +153,8 @@ struct OutlineFont *OpenOutlineFont(STRPTR fileName, struct List *list, ULONG fl gengine = OpenEngine(); SetInfo(gengine, - OT_OTagPath, otagpath, - OT_OTagList, buffer, + OT_OTagPath, (ULONG)otagpath, + OT_OTagList, (ULONG)buffer, TAG_DONE); of = AllocVec(sizeof(struct OutlineFont), MEMF_CLEAR); @@ -168,7 +173,7 @@ void CloseOutlineFont(struct OutlineFont *of, struct List *list) struct BulletBase *BulletBase = of->BulletBase; CloseEngine(of->GEngine); - CloseLibrary(BulletBase); + CloseLibrary((struct Library *)BulletBase); FreeVec(of->OTagPath); FreeVec(of->olf_OTagList); |