Merge pull request #41 from fjtrujy/ps2-newlib

Adapt PS2 port to latest status of the PS2SDK

.github/workflows/compilation.yml

+name: CI
+
+on:
+  push:
+  pull_request:
+  repository_dispatch:
+    types: [run_build]
+
+jobs:
+  build-ps2:
+    runs-on: ubuntu-latest
+    container: ps2dev/ps2dev:latest
+    steps:
+    - uses: actions/checkout@v2
+
+    - name: Install dependencies
+      run: |
+        apk add build-base git bash
+
+    - name: Compile project
+      run: |
+        make -f Makefile.libretro platform=ps2 clean all
+
+    - name: Get short SHA
+      id: slug
+      run: echo "::set-output name=sha8::$(echo ${GITHUB_SHA} | cut -c1-8)"
+
+    - name: Upload artifacts
+      if: ${{ success() }}
+      uses: actions/upload-artifact@v2
+      with:
+        name: 20408_libretro_ps2-${{ steps.slug.outputs.sha8 }}
+        path: 2048_libretro_ps2.a

Makefile.libretro

@@ -180,8 +180,7 @@ else ifeq ($(platform), ps2)
    TARGET := $(TARGET_NAME)_libretro_$(platform).$(EXT)
    CC = ee-gcc$(EXE_EXT)
    AR = ee-ar$(EXE_EXT)
-   PLATFORM_DEFINES := -DPS2 -G0
-   CFLAGS := -Ips2
+   PLATFORM_DEFINES := -DPS2 -G0 -DABGR8888
    STATIC_LINKING = 1
 
 # PSP

game_noncairo.c

@@ -35,7 +35,11 @@ typedef struct ctx_t
 ctx_t nullctx={0,0,0};
  
 #define PITCH 4
+#if defined(ABGR8888)
+#define RGB32(r, g, b,a)  ( (a)<<24 |((b) << (16)) | ((g) << 8) | ((r) << 0))
+#else
 #define RGB32(r, g, b,a)  ( (a)<<24 |((r) << (16)) | ((g) << 8) | ((b) << 0))
+#endif
 #define nullctx_fontsize(a) nullctx.fontsize_x=nullctx.fontsize_y=a
 
 int VIRTUAL_WIDTH;

ps2/stdint.h

-#ifndef STDINT_H
-#define STDINT_H
-
-typedef unsigned long     uintptr_t;
-typedef signed long       intptr_t;
-
-typedef signed char       int8_t;
-typedef signed short      int16_t;
-typedef signed int        int32_t;
-typedef signed long       int64_t;
-typedef unsigned char     uint8_t;
-typedef unsigned short    uint16_t;
-typedef unsigned int      uint32_t;
-typedef unsigned long     uint64_t;
-
-#define	 STDIN_FILENO	0	/* standard input file descriptor */
-#define	STDOUT_FILENO	1	/* standard output file descriptor */
-#define	STDERR_FILENO	2	/* standard error file descriptor */
-
-#define INT8_C(val)  val##c
-#define INT16_C(val) val##h
-#define INT32_C(val) val##i
-#define INT64_C(val) val##l
-
-#define UINT8_C(val)  val##uc
-#define UINT16_C(val) val##uh
-#define UINT32_C(val) val##ui
-#define UINT64_C(val) val##ul
-
-#endif //STDINT_H