github/amiga-clib2
1
0
Fork 0
mirror of https://github.com/adtools/clib2.git synced 2025-12-08 14:59:05 +00:00
Code Issues Releases Wiki Activity

- The Kickstart 1.x specific code for error requesters is no longer built

Browse Source 
for the OS4 library.


git-svn-id: file:///Users/olsen/Code/migration-svn-zu-git/logical-line-staging/clib2/trunk@14781 87f5fb63-7c3d-0410-a384-fd976d0f7a62
This commit is contained in:
Olaf Barthel
2004-12-13 11:11:57 +00:00
parent 19ea207fba
commit 7b67ccdec1
2 changed files with 24 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
library/GNUmakefile.os4
View File

@ -1,5 +1,5 @@
#
# $Id: GNUmakefile.os4,v 1.16 2004-11-28 12:30:53 tfrieden Exp $
# $Id: GNUmakefile.os4,v 1.17 2004-12-13 11:11:57 obarthel Exp $
#
# :ts=8
#
@ -97,7 +97,7 @@ FLOAT_TYPE :=
endif
ifeq (baserel,$(TYPE))
CODE_TYPE := -mbaserel -DBASEREL_DATA
CODE_TYPE := -mbaserel -DBASEREL_DATA
FLOAT_TYPE := -DPPC_FLOATING_POINT_SUPPORT
endif
@ -659,7 +659,7 @@ AMIGA_LIB = \
amiga_rexxvars.o \
amiga_setsuperattrs.o \
amiga_timedelay.o \
amiga_waitbeam.o
amiga_waitbeam.o
##############################################################################
@ -759,7 +759,7 @@ lib/small-data: lib
lib/soft-float: lib
-$(MAKEDIR) $@
lib/baserel: lib
-$(MAKEDIR) $@
@ -771,7 +771,7 @@ large_data:
large_data_softfloat:
-$(MAKEDIR) $@
baserel:
-$(MAKEDIR) $@
@ -843,7 +843,7 @@ lib/bcrtbegin.o : lib bcrtbegin.o
lib/bcrtend.o : lib bcrtend.o
$(COPY) bcrtend.o lib
lib/baserel/crt0.o : lib baserel/crt0.o
$(COPY) baserel/crt0.o lib/baserel
@ -991,10 +991,10 @@ mainb.o : stdlib_main.c
@$(CC) -o mainb.o -c $(WARNINGS) $(OPTIMIZE) $(DEBUG) $(OPTIONS) $(INCLUDES) -msdata=sysv -DSMALL_DATA stdlib_main.c
bcrtbegin.o : crtbegin.c
$(CC) -o bcrtbegin.o -c $(WARNINGS) $(OPTIMIZE) $(DEBUG) $(OPTIONS) $(INCLUDES) -msdata=sysv -DSMALL_DATA crtbegin.c
$(CC) -o bcrtbegin.o -c $(WARNINGS) $(OPTIMIZE) $(DEBUG) $(OPTIONS) $(INCLUDES) -msdata=sysv -DSMALL_DATA crtbegin.c
bcrtend.o : crtend.c
$(CC) -o bcrtend.o -c $(WARNINGS) $(OPTIMIZE) $(DEBUG) $(OPTIONS) $(INCLUDES) -msdata=sysv -DSMALL_DATA crtend.c
$(CC) -o bcrtend.o -c $(WARNINGS) $(OPTIMIZE) $(DEBUG) $(OPTIONS) $(INCLUDES) -msdata=sysv -DSMALL_DATA crtend.c
baserel/crt0.o : crt0.S
@echo "Assembling $<"
@ -1009,7 +1009,7 @@ baserel/mainb.o : stdlib_main.c
@$(CC) -o baserel/mainb.o -c $(WARNINGS) $(OPTIMIZE) $(DEBUG) $(OPTIONS) $(INCLUDES) -mbaserel -DBASEREL_DATA stdlib_main.c
baserel/crtbegin.o : crtbegin.c
$(CC) -o baserel/crtbegin.o -c $(WARNINGS) $(OPTIMIZE) $(DEBUG) $(OPTIONS) $(INCLUDES) -mbaserel -DBASEREL_DATA crtbegin.c
$(CC) -o baserel/crtbegin.o -c $(WARNINGS) $(OPTIMIZE) $(DEBUG) $(OPTIONS) $(INCLUDES) -mbaserel -DBASEREL_DATA crtbegin.c
baserel/crtend.o : crtend.c
$(CC) -o baserel/crtend.o -c $(WARNINGS) $(OPTIMIZE) $(DEBUG) $(OPTIONS) $(INCLUDES) -mbaserel -DBASEREL_DATA crtend.c
$(CC) -o baserel/crtend.o -c $(WARNINGS) $(OPTIMIZE) $(DEBUG) $(OPTIONS) $(INCLUDES) -mbaserel -DBASEREL_DATA crtend.c

20
library/stdlib_showerror.c
View File

@ -1,5 +1,5 @@
/*
* $Id: stdlib_showerror.c,v 1.1.1.1 2004-07-26 16:32:06 obarthel Exp $
* $Id: stdlib_showerror.c,v 1.2 2004-12-13 11:11:57 obarthel Exp $
*
* :ts=4
*
@ -110,13 +110,21 @@ __show_error(const char * message)
}
else
{
static struct TextAttr default_font = { (STRPTR)"topaz.font",8,FS_NORMAL,FPF_ROMFONT|FPF_DESIGNED };
static struct IntuiText sorry_text = {0,1,JAM1,6,3,&default_font,(STRPTR)"Sorry",NULL};
static struct IntuiText body_text = {0,1,JAM1,5,3,&default_font,(STRPTR)NULL,NULL};
/* The following does not make great sense on OS4. */
#if NOT defined(__amigaos4__)
{
static struct TextAttr default_font = { (STRPTR)"topaz.font",8,FS_NORMAL,FPF_ROMFONT|FPF_DESIGNED };
static struct IntuiText sorry_text = {0,1,JAM1,6,3,(struct IText *)NULL,(STRPTR)"Sorry",NULL};
static struct IntuiText body_text = {0,1,JAM1,5,3,(struct IText *)NULL,(STRPTR)NULL,NULL};
body_text.IText = (STRPTR)message;
sorry_text.ITextFont = &default_font;
body_text.ITextFont = &default_font;
AutoRequest(NULL,&body_text,NULL,&sorry_text,0,0,37 + 8 * strlen(message),46);
body_text.IText = (STRPTR)message;
AutoRequest(NULL,&body_text,NULL,&sorry_text,0,0,37 + 8 * strlen(message),46);
}
#endif /* __amigaos4__ */
}
}
else