From 3eedea828530362af541e9ce093aacc6773b95d2 Mon Sep 17 00:00:00 2001
From: aap <aap@papnet.eu>
Date: Tue, 28 Jul 2020 16:27:20 +0200
Subject: [PATCH] slightly fixed ps2 build

---
 premake5.lua     |  2 +-
 src/charset.cpp  |  3 ++-
 src/d3d/rwxbox.h |  2 +-
 src/rwengine.h   | 20 +++++++++++---------
 4 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/premake5.lua b/premake5.lua
index 05cec14..9bbee5e 100644
--- a/premake5.lua
+++ b/premake5.lua
@@ -237,7 +237,7 @@ project "ps2test"
 	libdirs { "$(PS2SDK)/ee/lib" }
 	links { "librw" }
 	-- "c -lc" is a hack because we need -lc twice for some reason
-	links { "c", "kernel", "mf" }
+	links { "c -lc", "kernel", "mf" }
 
 --project "ps2rastertest"
 --	kind "ConsoleApp"
diff --git a/src/charset.cpp b/src/charset.cpp
index bebd417..0d94be8 100644
--- a/src/charset.cpp
+++ b/src/charset.cpp
@@ -232,4 +232,5 @@ Charset::printBuffered(const char *str, int32 x, int32 y, bool32 hideSpaces)
 
 }
 
-#endif
\ No newline at end of file
+#endif
+
diff --git a/src/d3d/rwxbox.h b/src/d3d/rwxbox.h
index 92fd71c..848bfb9 100644
--- a/src/d3d/rwxbox.h
+++ b/src/d3d/rwxbox.h
@@ -96,7 +96,7 @@ Texture *readNativeTexture(Stream *stream);
 void writeNativeTexture(Texture *tex, Stream *stream);
 uint32 getSizeNativeTexture(Texture *tex);
 
-enum : uint32 {
+enum {
 	D3DFMT_UNKNOWN              = 0xFFFFFFFF,
 
 	/* Swizzled formats */
diff --git a/src/rwengine.h b/src/rwengine.h
index ef17a9a..ebf6a64 100644
--- a/src/rwengine.h
+++ b/src/rwengine.h
@@ -210,11 +210,13 @@ namespace null {
 	void beginUpdate(Camera*);
 	void endUpdate(Camera*);
 	void clearCamera(Camera*, RGBA *col, uint32 mode);
-	void showRaster(Raster*);
+	void showRaster(Raster*, uint32 flags);
 
 	void   setRenderState(int32 state, void *value);
 	void  *getRenderState(int32 state);
 
+	bool32 rasterRenderFast(Raster *raster, int32 x, int32 y);
+
 	Raster *rasterCreate(Raster*);
 	uint8 *rasterLock(Raster*, int32 level, int32 lockMode);
 	void   rasterUnlock(Raster*, int32 level);
@@ -226,17 +228,17 @@ namespace null {
 	bool32 rasterFromImage(Raster*, Image*);
 	Image *rasterToImage(Raster*);
 
-	void   im2DRenderLine(void*, int32, int32, int32);
-	void   im2DRenderTriangle(void*, int32, int32, int32, int32);
-	void   im2DRenderPrimitive(PrimitiveType, void*, int32);
-	void   im2DRenderIndexedPrimitive(PrimitiveType,
-	                                  void*, int32, void*, int32);
+	void im2DRenderLine(void*, int32, int32, int32);
+	void im2DRenderTriangle(void*, int32, int32, int32, int32);
+	void im2DRenderPrimitive(PrimitiveType, void*, int32);
+	void im2DRenderIndexedPrimitive(PrimitiveType, void*, int32, void*, int32);
 
-	void im3DTransform(void *vertices, int32 numVertices, Matrix *world);
-	void im3DRenderIndexed(PrimitiveType primType, void *indices, int32 numIndices);
+	void im3DTransform(void *vertices, int32 numVertices, Matrix *world, uint32 flags);
+	void im3DRenderPrimitive(PrimitiveType primType);
+	void im3DRenderIndexedPrimitive(PrimitiveType primType, void *indices, int32 numIndices);
 	void im3DEnd(void);
 
-	int deviceSystem(DeviceReq req, void*);
+	int deviceSystem(DeviceReq req, void *arg0, int32 n);
 
 	extern Device renderdevice;
 }