diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index bfdd6fbb8..673da2d37 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -169,7 +169,7 @@ jobs: - name: Build run: | cd build - cmake -DCMAKE_BUILD_TYPE=MinSizeRel -DBUILD_WITH_ALL=ON -DBUILD_SOKOL=ON -DCMAKE_TOOLCHAIN_FILE=rpi/toolchain.cmake .. + cmake -DCMAKE_BUILD_TYPE=MinSizeRel -DBUILD_WITH_ALL=ON -DBUILD_SDL=ON -DCMAKE_TOOLCHAIN_FILE=rpi/toolchain.cmake .. cmake --build . --config MinSizeRel --parallel - name: Deploy @@ -416,7 +416,7 @@ jobs: - uses: nttld/setup-ndk@v1 id: setup-ndk with: - ndk-version: r22b + ndk-version: r23c add-to-path: false local-cache: true diff --git a/cmake/sokol.cmake b/cmake/sokol.cmake index 8fca7b10e..cfc609f93 100644 --- a/cmake/sokol.cmake +++ b/cmake/sokol.cmake @@ -25,11 +25,7 @@ if(BUILD_SOKOL) target_compile_definitions(sokol PRIVATE SOKOL_D3D11) target_link_libraries(sokol PRIVATE D3D11) elseif(LINUX) - if(RPI) - target_compile_definitions(sokol PRIVATE SOKOL_GLES3) - else() - target_compile_definitions(sokol PRIVATE SOKOL_GLCORE) - endif() + target_compile_definitions(sokol PRIVATE SOKOL_GLCORE) target_link_libraries(sokol PRIVATE X11 Xcursor Xi GL m dl asound) elseif(ANDROID) target_compile_definitions(sokol PRIVATE SOKOL_GLES3)