From 09637be9987bd6c580d09d46c7e6a684898ef252 Mon Sep 17 00:00:00 2001 From: "anthony@rabine.fr" Date: Sun, 2 Feb 2025 20:38:25 +0100 Subject: [PATCH] fix ci and nsis package generation --- story-editor/CMakeLists.txt | 2 +- story-editor/delivery/linux_02_docker_launch_build.sh | 2 +- story-editor/delivery/linux_03_docker_launch_package.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/story-editor/CMakeLists.txt b/story-editor/CMakeLists.txt index 6050007..4821aa7 100644 --- a/story-editor/CMakeLists.txt +++ b/story-editor/CMakeLists.txt @@ -295,7 +295,7 @@ install(TARGETS ${STORY_EDITOR_PROJECT} BUNDLE DESTINATION ".") set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE") if(WIN32) - install_files("." FILES "${SDL_BIN_DIR}/SDL3.dll") + # install_files("." FILES "${SDL_BIN_DIR}/SDL3.dll") # install_files("." FILES "${SDL_IMAGE_BIN_DIR}/SDL3_image.dll") # install_files("." FILES "${SDL_MIXER_BIN_DIR}/SDL3_mixer.dll") install_files("." FILES "/usr/lib/gcc/x86_64-w64-mingw32/10-posix/libstdc++-6.dll") diff --git a/story-editor/delivery/linux_02_docker_launch_build.sh b/story-editor/delivery/linux_02_docker_launch_build.sh index b2cc320..f30c5e7 100755 --- a/story-editor/delivery/linux_02_docker_launch_build.sh +++ b/story-editor/delivery/linux_02_docker_launch_build.sh @@ -1,3 +1,3 @@ -docker run -v $(pwd)/..:/workspace cpp-dev-linux /bin/bash -c "cd /workspace/story-editor && ./build_linux.sh" +docker run -v $(pwd)/../..:/workspace cpp-dev-linux /bin/bash -c "cd /workspace/story-editor && ./build_linux.sh" diff --git a/story-editor/delivery/linux_03_docker_launch_package.sh b/story-editor/delivery/linux_03_docker_launch_package.sh index acb1029..91948cb 100755 --- a/story-editor/delivery/linux_03_docker_launch_package.sh +++ b/story-editor/delivery/linux_03_docker_launch_package.sh @@ -1,3 +1,3 @@ -docker run --privileged -v $(pwd)/..:/workspace cpp-dev-linux /bin/bash -c "cd /workspace/story-editor && ./build_appimage.sh" +docker run --privileged -v $(pwd)/../..:/workspace cpp-dev-linux /bin/bash -c "cd /workspace/story-editor && ./build_appimage.sh"