From a2e830d114a8519dc3dfd2bbd36bf06b9c5a6d2f Mon Sep 17 00:00:00 2001 From: TheBrokenRail Date: Fri, 3 Nov 2023 12:23:54 -0400 Subject: [PATCH] Fancy Paralel CI --- .github/workflows/build.yml | 49 ++++++++++++++++++++++++++++++++++--- source/CMakeLists.txt | 2 +- 2 files changed, 46 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index df65aee..161277f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -5,7 +5,15 @@ on: - pull_request jobs: - build: + linux: + strategy: + matrix: + include: + - name: OpenGL ES + flags: "-DUSE_GLES1_COMPATIBILITY_LAYER=ON" + - name: OpenGL + flags: "-DUSE_GLES1_COMPATIBILITY_LAYER=OFF" + name: Linux (${{ matrix.name }}) runs-on: ubuntu-latest steps: - name: Checkout Repository @@ -16,12 +24,45 @@ jobs: run: | sudo apt-get update sudo apt-get install --no-install-recommends -y build-essential cmake ninja-build libopenal-dev libsdl2-dev libpng-dev zlib1g-dev - - name: Build Desktop + - name: Build run: | cd platforms/sdl mkdir build cd build - cmake -GNinja .. + cmake -GNinja ${{ matrix.flags }} .. cmake --build . - - name: Build WASM + wasm: + name: WASM + runs-on: ubuntu-latest + steps: + - name: Checkout Repository + uses: actions/checkout@v3 + with: + submodules: true + - name: Build run: ./build-wasm.sh + android: + strategy: + matrix: + include: + - name: SDL + directory: platforms/sdl/android + - name: Native + directory: platforms/android + name: Android (${{ matrix.name }}) + runs-on: ubuntu-latest + steps: + - name: Checkout Repository + uses: actions/checkout@v3 + with: + submodules: true + - name: Setup JDK + uses: actions/setup-java@v3 + with: + java-version: '17' + distribution: 'temurin' + cache: gradle + - name: Build + run: | + cd ${{ matrix.directory }} + ./gradlew build diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt index f8b54f2..e839108 100644 --- a/source/CMakeLists.txt +++ b/source/CMakeLists.txt @@ -309,7 +309,7 @@ if(USE_SDL) target_link_libraries(reminecraftpe-core PUBLIC SDL) # OpenGL - if(NOT EMSCRIPTEN) + if(NOT EMSCRIPTEN AND NOT ANDROID) option(USE_GLES1_COMPATIBILITY_LAYER "Whether To Enable The GLESv1_CM Compatibility Layer" TRUE) else() set(USE_GLES1_COMPATIBILITY_LAYER TRUE CACHE BOOL "" FORCE)