.github/workflows/ci.yml

@@ -33,61 +33,6 @@ jobs:
       working-directory: ${{github.workspace}}/build
       run: ctest -C ${{env.BUILD_TYPE}}
 
-  android:
-    timeout-minutes: 30
-    # contains sections copied from sdl repo
-
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/checkout@v4
-      with:
-        submodules: recursive
-
-    - uses: nttld/setup-ndk@v1
-      id: setup_ndk
-      with:
-        local-cache: false # https://github.com/nttld/setup-ndk/issues/518
-        ndk-version: r26d
-
-    - uses: actions/setup-java@v4
-      with:
-        distribution: 'temurin'
-        java-version: '17'
-
-    - name: update vcpkg
-      run: |
-        git clone https://github.com/microsoft/vcpkg.git
-
-    - name: Install Dependencies (host)
-      run: sudo apt update && sudo apt -y install cmake pkg-config nasm
-
-    - name: Install Dependencies (target)
-      env:
-        ANDROID_NDK_HOME: ${{steps.setup_ndk.outputs.ndk-path}}
-      run: vcpkg install --triplet arm64-android --overlay-ports=vcpkg/ports libsodium openssl
-
-    # vcpkg scripts root /usr/local/share/vcpkg/scripts
-    - name: Configure CMake
-      env:
-        ANDROID_NDK_HOME: ${{steps.setup_ndk.outputs.ndk-path}}
-      run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCMAKE_TOOLCHAIN_FILE=/usr/local/share/vcpkg/scripts/buildsystems/vcpkg.cmake -DVCPKG_TARGET_TRIPLET=arm64-android -DANDROID=1 -DANDROID_PLATFORM=23 -DANDROID_ABI=arm64-v8a -DVCPKG_CHAINLOAD_TOOLCHAIN_FILE=${{steps.setup_ndk.outputs.ndk-path}}/build/cmake/android.toolchain.cmake
-
-    - name: Build
-      run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} -j 4
-
-    - name: Compress artifacts
-      shell: bash
-      run: |
-        tar -czvf ${{ github.event.repository.name }}-android-arm64.tar.gz -C ${{github.workspace}}/build/bin/ .
-
-    - uses: actions/upload-artifact@v4
-      with:
-        name: ${{ github.event.repository.name }}-android-arm64
-        # TODO: do propper packing
-        path: |
-          ${{github.workspace}}/${{github.event.repository.name}}-android-arm64.tar.gz
-
   macos:
     timeout-minutes: 10
 

CMakeLists.txt

@@ -21,10 +21,6 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
 option(SOLANACEAE_ECOSYSTEM_BUILD_TESTING "Build tests" ${BUILD_TESTING})
 message("II SOLANACEAE_ECOSYSTEM_BUILD_TESTING " ${SOLANACEAE_ECOSYSTEM_BUILD_TESTING})
 
-# uggly, but it needs to be defined for all dependencies too
-# what if its always export?
-add_compile_definitions(ENTT_API_EXPORT)
-
 if (SOLANACEAE_ECOSYSTEM_BUILD_TESTING)
 	include(CTest)
 endif()
@@ -63,3 +59,4 @@ endif()
 # cmake setup end
 
 add_subdirectory(./plugins)
+

external/CMakeLists.txt

@@ -11,7 +11,7 @@ add_subdirectory(./solanaceae_message3)
 set(SOLANACEAE_BRIDGE_BUILD_PLUGINS ON)
 add_subdirectory(./solanaceae_bridge)
 
-set(SOLANACEAE_OBJECT_STORE_BUILD_TESTING ON)
+set(SOLANACEAE_OBJECT_STORE_BUILD_TESTING ${SOLANACEAE_ECOSYSTEM_BUILD_TESTING})
 add_subdirectory(./solanaceae_object_store)
 
 add_subdirectory(./solanaceae_message_serializer)

external/solanaceae_contact

@@ -1 +1 @@
-Subproject commit 2401079c1daaa4b8fdae378a8cad8d429c619565
+Subproject commit e8b069c803e81152c538c87c28a891717099b269

external/solanaceae_crdtnotes

@@ -1 +1 @@
-Subproject commit a0d122540b1121b7b4a51c46c7d3861cf581f12d
+Subproject commit 568c532cdb8bebede8ec81cd9b7754b5ce841ce6

external/solanaceae_ircclient

@@ -1 +1 @@
-Subproject commit d7280771ce71dcb437d97ea6a6070d8888bf8ade
+Subproject commit 0379c8a5abcf6eef12c4a32bb962e9a0bb94afb7

external/solanaceae_ngc_ft1

@@ -1 +1 @@
-Subproject commit 0eb30246a85ba3dfb3327c57aab3a522dc60ead6
+Subproject commit 1231e792a7a23cd92b2b316252baedb39ce81a1e

external/solanaceae_plugin

@@ -1 +1 @@
-Subproject commit ade1b4ea74d07200df96537de53c9402a6caf9fe
+Subproject commit f7a519754d31313a5312a01a9c569edf76d15bac

external/solanaceae_toxic_games

@@ -1 +1 @@
-Subproject commit 599094c8e4b432008f09892043abe7034ff18a3a
+Subproject commit ff52f155663ae6e181d9e52e90bd32c116bd15b6

external/totato

@@ -1 +1 @@
-Subproject commit 4a59a83ecaa55fee07c2744ad30d4f12cf1cdd27
+Subproject commit bb9da772bc9679c4b0a01cea2da5873074b1782d

plugins/CMakeLists.txt

@@ -6,6 +6,7 @@ add_library(plugin_ngcft1 MODULE
 set_target_properties(plugin_ngcft1 PROPERTIES
 	C_VISIBILITY_PRESET hidden
 	VISIBILITY_INLINES_HIDDEN ON # do we need this?
+	POSITION_INDEPENDENT_CODE ON
 )
 target_compile_definitions(plugin_ngcft1 PUBLIC ENTT_API_IMPORT)