Remove some p96 usage

6 files changed, 21 insertions, 4 deletions

diff --git a/amiga/bitmap.c b/amiga/bitmap.c
index e7bd72ce4..b7eb129db 100644
--- a/amiga/bitmap.c
+++ b/amiga/bitmap.c
@@ -19,8 +19,8 @@
 #include "amiga/os3support.h"
 
 #include <proto/exec.h>
-#include <proto/Picasso96API.h>
 #ifdef __amigaos4__
+#include <proto/Picasso96API.h>
 #include <graphics/blitattr.h>
 #include <graphics/composite.h>
 #endif
@@ -388,6 +388,7 @@ struct bitmap *ami_bitmap_from_datatype(char *filename)
 
 static struct BitMap *ami_bitmap_get_truecolour(struct bitmap *bitmap,int width,int height,struct BitMap *friendbm)
 {
+#ifdef __amigaos4__
 	struct RenderInfo ri;
 	struct BitMap *tbm = NULL;
 	struct RastPort trp;
@@ -495,6 +496,7 @@ static struct BitMap *ami_bitmap_get_truecolour(struct bitmap *bitmap,int width,
 	}
 
 	return tbm;
+#endif
 }
 
 PLANEPTR ami_bitmap_get_mask(struct bitmap *bitmap, int width,
@@ -581,3 +583,4 @@ struct BitMap *ami_bitmap_get_native(struct bitmap *bitmap,
 		return ami_bitmap_get_truecolour(bitmap, width, height, friendbm);
 	}
 }
+
diff --git a/amiga/gui.c b/amiga/gui.c
index 534637bc4..bede04836 100644
--- a/amiga/gui.c
+++ b/amiga/gui.c
@@ -34,8 +34,8 @@
 #include <proto/intuition.h>
 #include <proto/keymap.h>
 #include <proto/locale.h>
-#include <proto/Picasso96API.h>
 #ifdef __amigaos4__
+#include <proto/Picasso96API.h>
 #include <proto/popupmenu.h>
 #endif
 #include <proto/utility.h>
@@ -5174,6 +5174,11 @@ Object *ami_gui_splash_open(void)
 					LAYOUT_AddImage, bm_obj = BitMapObject,
 						BITMAP_SourceFile, "PROGDIR:Resources/splash.png",
 						BITMAP_Screen, wbscreen,
+						BITMAP_Precision, PRECISION_IMAGE,
+#ifndef __amigaos4__
+						BITMAP_Width, 400,
+						BITMAP_Height, 250,
+#endif
 					BitMapEnd,
 				LayoutEnd,
 			EndWindow;
diff --git a/amiga/libs.c b/amiga/libs.c
index 4deb88a97..9ac9589c3 100644
--- a/amiga/libs.c
+++ b/amiga/libs.c
@@ -76,6 +76,7 @@
 
 #ifdef __amigaos4__
 AMINS_LIB_STRUCT(Application);
+AMINS_LIB_STRUCT(P96);
 #else
 struct UtilityBase *UtilityBase; /* AMINS_LIB_STRUCT(Utility) */
 #endif
@@ -90,7 +91,6 @@ AMINS_LIB_STRUCT(Intuition);
 AMINS_LIB_STRUCT(Keymap);
 AMINS_LIB_STRUCT(Layers);
 AMINS_LIB_STRUCT(Locale);
-AMINS_LIB_STRUCT(P96);
 AMINS_LIB_STRUCT(Workbench);
 
 AMINS_LIB_STRUCT(ARexx);
@@ -213,10 +213,10 @@ void ami_libs_close(void)
 	AMINS_LIB_CLOSE(Keymap)
 	AMINS_LIB_CLOSE(Layers)
 	AMINS_LIB_CLOSE(Locale)
-	AMINS_LIB_CLOSE(P96)
 	AMINS_LIB_CLOSE(Workbench)
 #ifdef __amigaos4__
 	AMINS_LIB_CLOSE(Application)
+	AMINS_LIB_CLOSE(P96)
 #else
 	AMINS_LIB_CLOSE(Utility)
 #endif
diff --git a/amiga/os3support.h b/amiga/os3support.h
index ecb6f4a9a..a8c5abad2 100644
--- a/amiga/os3support.h
+++ b/amiga/os3support.h
@@ -149,6 +149,11 @@
 #define IDoSuperMethodA DoSuperMethodA
 #define ShowWindow(...) (void)0
 
+/* P96 */
+#define p96FreeBitMap(B) FreeBitMap(B)
+#define p96AllocBitMap(W,H,D,FL,FR,FM) AllocBitMap(W,H,D,FL,FR)
+#define p96RectFill(RP,X,Y,XW,YH,C) RectFill(RP,X,Y,XW,YH) /* Needs pen */
+
 /* Utility */
 #define SetMem memset
 #define SNPrintf snprintf
diff --git a/amiga/plotters.c b/amiga/plotters.c
index f672e7a7b..eaf775183 100755
--- a/amiga/plotters.c
+++ b/amiga/plotters.c
@@ -18,7 +18,9 @@
 
 #include "amiga/os3support.h"
 
+#ifdef __amigaos4__
 #include <proto/Picasso96API.h>
+#endif
 #include <proto/exec.h>
 #include <proto/intuition.h>
 
diff --git a/amiga/thumbnail.c b/amiga/thumbnail.c
index 7b3c156eb..5333b4ce1 100755
--- a/amiga/thumbnail.c
+++ b/amiga/thumbnail.c
@@ -19,7 +19,9 @@
 #include "amiga/os3support.h"
 
 #include <proto/graphics.h>
+#ifdef __amigaos4__
 #include <proto/Picasso96API.h>
+#endif
 #include <intuition/intuition.h>
 #ifdef __amigaos4__
 #include <graphics/blitattr.h>