Build both targets

RavEngine · Feb 15, 2024 · 7e9dce3 · 7e9dce3
1 parent ba0f818
commit 7e9dce3
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -6,6 +6,10 @@ jobs:
   apk:
     name: Apk Build
     runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+          target: [Debug, Release]
 
     steps:
       - name: Get the Android Builder
@@ -22,10 +26,10 @@ jobs:
       - name: Build the APK
         run: |
           cd sdl-android-builder
-          ./gradlew assembleRelease
+          ./gradlew assemble${{ matrix.target }}
 
       - name: Upload the APK
         uses: actions/upload-artifact@v3
         with: 
-          name: app-debug.apk
+          name: app-${{matrix.target}}.apk
           path: sdl-android-builder/app/build/outputs/apk/*
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,7 +1,5 @@
 cmake_minimum_required(VERSION 3.21)
 
-set(ANDROID_USE_LEGACY_TOOLCHAIN_FILE OFF CACHE BOOL "Don't use legacy android toolchain file" FORCE)
-
 # make "install" write to the build directory
 set(CMAKE_INSTALL_PREFIX ${CMAKE_CURRENT_BINARY_DIR})
 
@@ -11,6 +9,9 @@ set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/$<CONFIGURATION>)
 
 PROJECT(HelloCube)
 
+string(REPLACE "-Wl,--gc-sections" "" CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS}")
+string(REPLACE "-Wl,--no-undefined" "" CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS}")
+
 add_subdirectory("RavEngine" EXCLUDE_FROM_ALL) # configure the engine library
 
 # configure your executable like normal