From 5918b610f831dfb211346b511225a09492a2aeb7 Mon Sep 17 00:00:00 2001 From: "anthony@rabine.fr" Date: Sun, 16 Feb 2025 21:40:15 +0100 Subject: [PATCH] fix CI (tentative) --- .github/workflows/story_editor.yml | 4 ++-- story-editor/CMakeLists.txt | 9 ++++++--- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.github/workflows/story_editor.yml b/.github/workflows/story_editor.yml index 9de7cca..503b5f1 100644 --- a/.github/workflows/story_editor.yml +++ b/.github/workflows/story_editor.yml @@ -1,4 +1,4 @@ -name: build-story-editor +name: Build-StoryEditor on: workflow_dispatch: {} @@ -17,7 +17,7 @@ jobs: run : | ./linux_01_docker_build_image.sh ./linux_02_docker_launch_build.sh - ./linux_02_docker_launch_package.sh + ./linux_03_docker_launch_package.sh build_win32: runs-on: ubuntu-latest steps: diff --git a/story-editor/CMakeLists.txt b/story-editor/CMakeLists.txt index e2893d6..fe6072f 100644 --- a/story-editor/CMakeLists.txt +++ b/story-editor/CMakeLists.txt @@ -61,9 +61,9 @@ include_directories(externals/civetweb/include) # ========================================================================================================================= # MBEDTLS # ========================================================================================================================= -set(USE_STATIC_MBEDTLS_LIBRARY ON) -set(ENABLE_PROGRAMS OFF) -set(ENABLE_TESTING OFF) +set(USE_STATIC_MBEDTLS_LIBRARY ON CACHE INTERNAL "" FORCE) +set(ENABLE_PROGRAMS OFF CACHE INTERNAL "" FORCE) +set(ENABLE_TESTING OFF CACHE INTERNAL "" FORCE) add_subdirectory(externals/mbedtls EXCLUDE_FROM_ALL) @@ -285,6 +285,9 @@ if(UNIX) ) elseif(WIN32) target_link_libraries(${STORY_EDITOR_PROJECT} + + PUBLIC + OpenGL::GL SDL3_image::SDL3_image SDL3_mixer::SDL3_mixer