Compare commits

..

10 Commits

Author SHA1 Message Date
bc46deb600
update irc plug, can now detect disconnect and reconnects
Some checks failed
ContinuousDelivery / linux-ubuntu (push) Failing after 2m3s
ContinuousIntegration / linux (push) Successful in 2m18s
ContinuousIntegration / android (push) Failing after 4m30s
ContinuousDelivery / windows (push) Has been cancelled
ContinuousIntegration / macos (push) Has been cancelled
ContinuousIntegration / windows (push) Has been cancelled
ContinuousDelivery / release (push) Has been cancelled
2024-06-18 18:43:42 +02:00
08a1d576a7
update totato 2024-06-12 21:09:54 +02:00
93a0ee8c77
add android ci (testing) 2024-06-04 15:46:02 +02:00
197118d6d0
update plugin sub 2024-06-04 15:22:36 +02:00
1c84b53100
small ngcft1 update 2024-05-31 17:04:47 +02:00
25dde16d3d
updates, mostly irc 2024-05-31 15:37:18 +02:00
a225d6142f
update imgui to v1.90.7 2024-05-28 17:32:02 +02:00
a5c26e6b51
always exporting, rollingback the funky stuff 2024-05-28 11:57:11 +02:00
ab8cc6dde1
try always exporting 2024-05-28 11:26:46 +02:00
fb5397097b
global export/import 2024-05-28 10:57:40 +02:00
11 changed files with 67 additions and 10 deletions

View File

@ -33,6 +33,61 @@ jobs:
working-directory: ${{github.workspace}}/build working-directory: ${{github.workspace}}/build
run: ctest -C ${{env.BUILD_TYPE}} 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: macos:
timeout-minutes: 10 timeout-minutes: 10

View File

@ -21,6 +21,10 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
option(SOLANACEAE_ECOSYSTEM_BUILD_TESTING "Build tests" ${BUILD_TESTING}) option(SOLANACEAE_ECOSYSTEM_BUILD_TESTING "Build tests" ${BUILD_TESTING})
message("II SOLANACEAE_ECOSYSTEM_BUILD_TESTING " ${SOLANACEAE_ECOSYSTEM_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) if (SOLANACEAE_ECOSYSTEM_BUILD_TESTING)
include(CTest) include(CTest)
endif() endif()
@ -59,4 +63,3 @@ endif()
# cmake setup end # cmake setup end
add_subdirectory(./plugins) add_subdirectory(./plugins)

View File

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

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

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

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

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

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

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

2
external/totato vendored

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

View File

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