.gitignore

@@ -1 +0,0 @@
-*.o

Makefile.AmigaOS

@@ -4,7 +4,7 @@
 
 CXX = g++
 CXXFLAGS = -mcrt=clib2 -O3 -Iinclude -Igpc -Ifont_freetype
-CXXLIBS = -Llib -lagg -athread=native
+CXXLIBS = -Llib -lagg
 CC = gcc
 CFLAGS = -mcrt=clib2 -O3 -Igpc
 AR = ar
@@ -170,9 +170,7 @@ freetype: lib $(FREETYPE_EXAMPLES)
 clean:
 	-@Delete *>NIL: FORCE QUIET examples/#?.o
 	-@Delete *>NIL: FORCE QUIET $(PLATFORM_OBJ) $(FREETYPE_OBJ) $(LIB_OBJ) $(SVG_OBJ)
-	-@copy CLONE ALL bin/#?.cmake#? T:agg_tmp
 	-@Delete *>NIL: FORCE QUIET ALL lib bin
-	-@copy CLONE T:agg_tmp/#? bin
 
 install: lib
 	-@Copy CLONE $(LIBNAME) SDK:Local/clib2/lib

Makefile.AmigaOS-newlib

@@ -171,9 +171,7 @@ freetype: lib $(FREETYPE_EXAMPLES)
 clean:
 	-@Delete *>NIL: FORCE QUIET examples/#?.o
 	-@Delete *>NIL: FORCE QUIET $(PLATFORM_OBJ) $(FREETYPE_OBJ) $(LIB_OBJ) $(SVG_OBJ)
-	-@copy CLONE ALL bin/#?.cmake#? T:agg_tmp
 	-@Delete *>NIL: FORCE QUIET ALL lib bin
-	-@copy CLONE T:agg_tmp/#? bin
 
 install: lib
 	-@Copy CLONE $(LIBNAME) SDK:Local/newlib/lib

src/platform/AmigaOS/agg_platform_support.cpp

@@ -49,10 +49,6 @@ KeymapIFace* IKeymap = 0;
 Class* RequesterClass = 0;
 Class* WindowClass = 0;
 
-struct RenderInfo {
-	APTR				Memory;
-	UWORD			 BytesPerRow;
-};
 
 namespace agg
 {
@@ -72,7 +68,7 @@ namespace agg
 		bool make_bitmap();
 	public:
 		platform_support& m_support;
-		enPixelFormat m_ftype;
+		RGBFTYPE m_ftype;
 		pix_format_e m_format;
 		unsigned m_bpp;
 		BitMap* m_bitmap;
@@ -93,7 +89,7 @@ namespace agg
 	platform_specific::platform_specific(platform_support& support,
 		pix_format_e format, bool flip_y) :
 		m_support(support),
-		m_ftype(PIXF_NONE),
+		m_ftype(RGBFB_NONE),
 		m_format(format),
 		m_bpp(0),
 		m_bitmap(0),
@@ -114,35 +110,35 @@ namespace agg
 			// Not supported.
 			break;
 		case pix_format_rgb555:
-			m_ftype = PIXF_R5G5B5;
+			m_ftype = RGBFB_R5G5B5;
 			m_bpp = 15;
 			break;
 		case pix_format_rgb565:
-			m_ftype = PIXF_R5G6B5;
+			m_ftype = RGBFB_R5G6B5;
 			m_bpp = 16;
 			break;
 		case pix_format_rgb24:
-			m_ftype = PIXF_R8G8B8;
+			m_ftype = RGBFB_R8G8B8;
 			m_bpp = 24;
 			break;
 		case pix_format_bgr24:
-			m_ftype = PIXF_B8G8R8;
+			m_ftype = RGBFB_B8G8R8;
 			m_bpp = 24;
 			break;
 		case pix_format_bgra32:
-			m_ftype = PIXF_B8G8R8A8;
+			m_ftype = RGBFB_B8G8R8A8;
 			m_bpp = 32;
 			break;
 		case pix_format_abgr32:
-			m_ftype = PIXF_A8B8G8R8;
+			m_ftype = RGBFB_A8B8G8R8;
 			m_bpp = 32;
 			break;
 		case pix_format_argb32:
-			m_ftype = PIXF_A8R8G8B8;
+			m_ftype = RGBFB_A8R8G8B8;
 			m_bpp = 32;
 			break;
         case pix_format_rgba32:
-			m_ftype = PIXF_R8G8B8A8;
+			m_ftype = RGBFB_R8G8B8A8;
 			m_bpp = 32;
 			break;
 		}
@@ -240,12 +236,12 @@ namespace agg
 
 				bool supported = false;
 
-				enPixelFormat ftype = static_cast<enPixelFormat>(IGraphics->GetBitMapAttr(
+				RGBFTYPE ftype = static_cast<RGBFTYPE>(IGraphics->GetBitMapAttr(
 					src_bitmap, BMA_PIXELFORMAT));
 
 				switch ( ftype )
 				{
-				case PIXF_R8G8B8:
+				case RGBFB_R8G8B8:
 					supported = true;
 					break;
 				default:
@@ -496,7 +492,7 @@ namespace agg
 	bool platform_support::init(unsigned width, unsigned height,
 		unsigned flags)
 	{
-		if( m_specific->m_ftype == PIXF_NONE )
+		if( m_specific->m_ftype == RGBFB_NONE )
 		{
 			message("Unsupported mode requested.");
 			return false;
@@ -555,14 +551,14 @@ namespace agg
 			return false;
 		}
 
-		enPixelFormat ftype = static_cast<enPixelFormat>(IGraphics->GetBitMapAttr(
+		RGBFTYPE ftype = static_cast<RGBFTYPE>(IGraphics->GetBitMapAttr(
 			m_specific->m_window->RPort->BitMap, BMA_PIXELFORMAT));
 			
 		switch ( ftype )
 		{
-		case PIXF_A8R8G8B8:
-		case PIXF_B8G8R8A8:
-		case PIXF_R5G6B5PC:
+		case RGBFB_A8R8G8B8:
+		case RGBFB_B8G8R8A8:
+		case RGBFB_R5G6B5PC:
 			break;
 		default:
 			message("Unsupported screen mode.\n");