[Scummvm-git-logs] scummvm master -> 794f292b5d0701488248ce02f43ab510d4467c5d

[bluegr]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
794f292b5d AMIGAOS: Use compiler defines


Commit: 794f292b5d0701488248ce02f43ab510d4467c5d
    https://github.com/scummvm/scummvm/commit/794f292b5d0701488248ce02f43ab510d4467c5d
Author: Hubert Maier (raziel- at users.noreply.github.com)
Date: 2024-03-16T01:59:27+02:00

Commit Message:
AMIGAOS: Use compiler defines

Changed paths:
    backends/graphics3d/opengl/surfacerenderer.cpp
    backends/networking/enet/source/unix.cpp
    graphics/opengl/context.cpp
    graphics/opengl/shader.cpp


diff --git a/backends/graphics3d/opengl/surfacerenderer.cpp b/backends/graphics3d/opengl/surfacerenderer.cpp
index 7d15fe44a14..76286d0e078 100644
--- a/backends/graphics3d/opengl/surfacerenderer.cpp
+++ b/backends/graphics3d/opengl/surfacerenderer.cpp
@@ -180,7 +180,7 @@ static const char *const boxVertex =
 	"uniform vec2 sizeWH;\n"
 	"uniform vec2 texcrop;\n"
 // OGLES2 on AmigaOS doesn't support uniform booleans
-#if defined(AMIGAOS)
+#if defined(__amigaos4__)
 	"uniform mediump int flipY;\n"
 #else
 	"uniform bool flipY;\n"
@@ -191,7 +191,7 @@ static const char *const boxVertex =
 		"vec2 pos = offsetXY + position * sizeWH;\n"
 		"pos.x = pos.x * 2.0 - 1.0;\n"
 		"pos.y = pos.y * 2.0 - 1.0;\n"
-#if defined(AMIGAOS)
+#if defined(__amigaos4__)
 		"if (flipY != 0)\n"
 #else
 		"if (flipY)\n"
diff --git a/backends/networking/enet/source/unix.cpp b/backends/networking/enet/source/unix.cpp
index c6277b80e60..1487315b634 100644
--- a/backends/networking/enet/source/unix.cpp
+++ b/backends/networking/enet/source/unix.cpp
@@ -453,7 +453,7 @@ enet_socket_send (ENetSocket socket,
         sin.sin_port = ENET_HOST_TO_NET_16 (address -> port);
         sin.sin_addr.s_addr = address -> host;
 
-#ifdef AMIGAOS
+#if defined(__amigaos4__)
         msgHdr.msg_name = (char *)& sin;
 #else
         msgHdr.msg_name = & sin;
@@ -491,7 +491,7 @@ enet_socket_receive (ENetSocket socket,
 
     if (address != NULL)
     {
-#ifdef AMIGAOS
+#if defined(__amigaos4__)
         msgHdr.msg_name = (char *)& sin;
 #else
         msgHdr.msg_name = & sin;
diff --git a/graphics/opengl/context.cpp b/graphics/opengl/context.cpp
index e2f83cdf311..b8cf429661d 100644
--- a/graphics/opengl/context.cpp
+++ b/graphics/opengl/context.cpp
@@ -208,7 +208,7 @@ void Context::initialize(ContextType contextType) {
 	if (type == kContextGLES2) {
 // OGLES2 on AmigaOS reports GLSL version as 0.9 but we do what is needed to make it work
 // so let's pretend it supports 1.00
-#if defined(AMIGAOS)
+#if defined(__amigaos4__)
 		if (glslVersion < 100) {
 			glslVersion = 100;
 		}
diff --git a/graphics/opengl/shader.cpp b/graphics/opengl/shader.cpp
index 89d0b94dfda..f625d2d4ab9 100644
--- a/graphics/opengl/shader.cpp
+++ b/graphics/opengl/shader.cpp
@@ -67,7 +67,7 @@ static const char *const compatFragment =
 	"#endif\n";
 
 // OGLES2 on AmigaOS doesn't support uniform booleans, let's introduce some shim
-#if defined(AMIGAOS)
+#if defined(__amigaos4__)
 static const char *const compatUniformBool =
 	"#define UBOOL mediump int\n"
 	"#define UBOOL_TEST(v) (v != 0)\n";