diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 9868570..a72f3ed 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -14,14 +14,14 @@ jobs: container: image: klonyyy/armnoneeabi:2 steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: submodules: recursive # token: ${{ secrets.PAT }} - name: build_step shell: bash run: ./release.sh - - uses: actions/upload-artifact@v3 + - uses: actions/upload-artifact@v4 with: name: MDtool path: build/packages/* diff --git a/CMakeLists.txt b/CMakeLists.txt index 3a8eb39..91d8d26 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,7 +1,7 @@ cmake_minimum_required(VERSION 3.5) set(CMAKE_CXX_STANDARD 14) -set(MDTOOL_VERSION 1.5.2) +set(MDTOOL_VERSION 1.5.3) set(MDTOOL_VERSION_TAG 'r') @@ -39,7 +39,7 @@ add_subdirectory(candle) set(CMAKE_BUILD_TYPE Release) add_executable(${PROJECT_NAME} ${SRC}) -target_link_libraries(${PROJECT_NAME} candle) +target_link_libraries(${PROJECT_NAME} candle -static-libgcc -static-libstdc++) target_include_directories(${PROJECT_NAME} PUBLIC ${CMAKE_SOURCE_DIR}/include ${CMAKE_SOURCE_DIR}/candle/include ${CMAKE_SOURCE_DIR}/3rd_party/mINI/src) set_target_properties(${PROJECT_NAME} PROPERTIES OUTPUT_NAME "mdtool") diff --git a/candle b/candle index c79d365..a93f305 160000 --- a/candle +++ b/candle @@ -1 +1 @@ -Subproject commit c79d3654a0e4369960f53520213df64869f6533c +Subproject commit a93f3054f819e208596e36789ecb56ee481812ed