Amiga: drop SHAREDLIB dead build flavor

This commit is contained in:
Ingo Paschke
2026-05-11 20:29:47 +02:00
parent 7b67da20b7
commit a8e54185eb
5 changed files with 1 additions and 60 deletions
-11
View File
@@ -690,13 +690,6 @@ amii_cleanup(void)
IntuitionBase = NULL;
}
#ifdef SHAREDLIB
if (DOSBase) {
CloseLibrary((struct Library *) DOSBase);
DOSBase = NULL;
}
#endif
((struct Process *) FindTask(NULL))->pr_WindowPtr = (APTR) pr_WindowPtr;
Initialized = 0;
@@ -704,7 +697,6 @@ amii_cleanup(void)
#endif /* AMII_GRAPHICS */
#ifndef SHAREDLIB
void
Abort(long rc)
{
@@ -733,7 +725,6 @@ CleanUp(void)
{
amii_cleanup();
}
#endif
#ifdef AMII_GRAPHICS
@@ -849,7 +840,6 @@ amii_number_pad(int state)
}
#endif /* AMII_GRAPHICS */
#ifndef SHAREDLIB
void
amiv_loadlib(void)
{
@@ -879,4 +869,3 @@ VA_DECL(const char *, s)
VA_END();
Abort(0L);
}
#endif
+1 -2
View File
@@ -159,8 +159,7 @@ unsigned short amiv_init_map[AMII_MAXCOLORS] = {
0x0fff, /* color #31 */
};
#if !defined(TTY_GRAPHICS) \
|| defined(SHAREDLIB) /* this should be shared better */
#ifndef TTY_GRAPHICS
char morc; /* the character typed in response to a --more-- prompt */
#endif
char spaces[76] = " "
-4
View File
@@ -53,10 +53,6 @@ CLIPPING must be defined for the AMIGA version
#include <proto/graphics.h>
#include <proto/intuition.h>
#ifdef SHAREDLIB
#include "NH:sys/amiga/lib/libmacs.h"
#endif
#include <utility/tagitem.h>
#define WINVERS_AMII (strcmp("amii", windowprocs.name) == 0)
-27
View File
@@ -18,7 +18,6 @@ extern int LI;
extern int scrollmsg;
extern int alwaysinvent;
#ifndef SHAREDLIB
extern unsigned short amii_defpens[20];
extern struct amii_DisplayDesc
*amiIDisplay; /* the Amiga Intuition descriptor */
@@ -33,21 +32,6 @@ extern long amii_scrnmode;
extern winid amii_rawprwin;
extern struct Screen *HackScreen;
extern char Initialized;
/* These have already been defined elsewhere (and some are conflicting)
* ... going ... going once ... going twice ....
* extern const char *roles[];
* extern struct Library *ConsoleDevice;
* extern char toplines[ TBUFSZ ];
* extern NEARDATA winid WIN_MESSAGE;
* extern NEARDATA winid WIN_MAP;
* extern NEARDATA winid WIN_STATUS;
* extern NEARDATA winid WIN_INVEN;
* extern winid WIN_OVER;
* extern struct GfxBase *GfxBase;
* extern struct Library *DiskfontBase;
* extern struct IntuitionBase *IntuitionBase;
* extern struct Library *LayersBase;
*/
extern int amii_msgAPen;
extern int amii_msgBPen;
extern int amii_statAPen;
@@ -58,9 +42,6 @@ extern int amii_textAPen;
extern int amii_textBPen;
extern int amii_otherAPen;
extern int amii_otherBPen;
#else
extern WinamiBASE *WinamiBase;
#endif
/* All kinds of shared stuff */
extern struct TextAttr Hack160;
extern struct TextAttr Hack40;
@@ -132,17 +113,9 @@ typedef enum {
extern struct PDAT pictdata;
extern struct Hook fillhook;
extern struct TagItem wintags[];
#ifndef SHAREDLIB
#ifndef __GNUC__
void __asm LayerFillHook(register __a0 struct Hook *hk,
register __a2 struct RastPort *rp,
register __a1 struct FillParams *fp);
#else
#ifdef __PPC__
struct EmulLibEntry LayerFillHook;
#else
void LayerFillHook(void);
#endif
#endif
#endif
extern int mxsize, mysize;
-16
View File
@@ -58,9 +58,7 @@ int amikbhit(void);
int WindowGetchar(void);
WETYPE WindowGetevent(void);
void amii_cleanup(void);
#ifndef SHAREDLIB
void Abort(long rc);
#endif
void CleanUp(void);
void flush_glyph_buffer(struct Window *w);
void amiga_print_glyph(winid window, int color_index, int glyph);
@@ -71,10 +69,8 @@ void FreeNewWindow(struct NewWindow *win);
void bell(void);
void amii_delay_output(void);
void amii_number_pad(int state);
#ifndef SHAREDLIB
void amiv_loadlib(void);
void amii_loadlib(void);
#endif
void preserve_icon(void);
void clear_icon(void);
@@ -114,10 +110,6 @@ BitMapHeader ReadTileImageFiles(void);
void FreeTileImageFiles(void);
/* winami.c */
#ifdef SHAREDLIB
int __UserLibInit(void);
void __UserLibCleanup(void);
#endif
void amii_askname(void);
void amii_player_selection(void);
void RandomWindow(char *name);
@@ -127,15 +119,7 @@ void amii_display_file(const char *fn, boolean complain);
void SetBorder(struct Gadget *gd);
/* malloc/free provided by stdlib.h */
#ifdef SHAREDLIB
/* amilib.c */
void amii_loadlib(void);
void amiv_loadlib(void);
void CleanUp(void);
void setup_librefs(WinamiBASE *base);
#else
void Abort(long rc);
#endif
win_request_info *amii_ctrl_nhwindow(winid, int, win_request_info *);