From bb2fa206361914722e4ac65347d1b3b57bc9eb00 Mon Sep 17 00:00:00 2001
From: blckbearx <58561253+blckbearx@users.noreply.github.com>
Date: Tue, 3 Aug 2021 22:36:25 -0300
Subject: [PATCH 1/2] Make $USE_NEW_PS2SDK available to all make's child
 processes.

Make the variable USE_NEW_PS2SDK available to all make's child processes so that building ps2-audsrv with the new SDK does not fail under Ubuntu 20.04.
---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 565da89923..53ca204a69 100644
--- a/Makefile
+++ b/Makefile
@@ -255,7 +255,7 @@ ifeq ($(TARGET_PS2),1)
     ifeq ($(EE_CC_VERSION),)
       $(error No valid GCC found in PATH)
     else
-      USE_NEW_PS2SDK := 1
+      export USE_NEW_PS2SDK := 1
     endif
   endif
   endif

From eda8724d0f3fe19aa9039a8dc055490b6d2cd6fe Mon Sep 17 00:00:00 2001
From: blckbearx <58561253+blckbearx@users.noreply.github.com>
Date: Tue, 3 Aug 2021 22:55:31 -0300
Subject: [PATCH 2/2] PS2: Remove duplicate definition of a variable

Remove the duplicate definition of a variable to avoid the following error:

/usr/local/ps2dev/ee/lib/gcc/mips64r5900el-ps2-elf/11.1.0/../../../../mips64r5900el-ps2-elf/bin/ld: build/us_ps2/src/pc/gfx/gfx_ps2_wapi.o:(.bss+0x0): multiple definition of `render_finished'; build/us_ps2/src/pc/gfx/gfx_ps2_rapi.o:(.bss+0x0): first defined here
collect2: error: ld returned 1 exit status
---
 src/pc/gfx/gfx_ps2_wapi.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/pc/gfx/gfx_ps2_wapi.c b/src/pc/gfx/gfx_ps2_wapi.c
index 9ec3c22abd..d233ba0c28 100644
--- a/src/pc/gfx/gfx_ps2_wapi.c
+++ b/src/pc/gfx/gfx_ps2_wapi.c
@@ -54,7 +54,6 @@ static bool do_render = true;
 
 static volatile unsigned int vblank_count = 0;
 static int vsync_callback_id = -1;
-volatile bool render_finished;
 
 static int vsync_callback(void) {
     if (render_finished) gsKit_display_buffer(gs_global); // working buffer gets displayed