From 1192755617aa943dbbcfadf6baa638c450fec488 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tur=C3=A1nszki=20J=C3=A1nos?= Date: Sun, 11 May 2025 09:54:45 +0200 Subject: [PATCH] linux: don't include languages folder because some version of linux can't open some files --- .github/workflows/build-nightly.yml | 2 -- .github/workflows/build-pr.yml | 2 -- .github/workflows/build.yml | 2 -- Editor/CMakeLists.txt | 4 ++-- 4 files changed, 2 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build-nightly.yml b/.github/workflows/build-nightly.yml index a7936747b..14cec26d0 100644 --- a/.github/workflows/build-nightly.yml +++ b/.github/workflows/build-nightly.yml @@ -79,7 +79,6 @@ jobs: mv build/Editor/WickedEngineEditor ./Editor_Linux mv Editor/config.ini ./ mv Editor/startup.lua ./ - mv Editor/languages ./ mv Editor/fonts ./ - name: Package Editor @@ -87,7 +86,6 @@ jobs: with: name: Editor (Linux) path: | - languages/ fonts/ config.ini startup.lua diff --git a/.github/workflows/build-pr.yml b/.github/workflows/build-pr.yml index 3ca690ebc..a4d6baaad 100644 --- a/.github/workflows/build-pr.yml +++ b/.github/workflows/build-pr.yml @@ -127,7 +127,6 @@ jobs: mv build/Editor/WickedEngineEditor ./Editor_Linux mv Editor/config.ini ./ mv Editor/startup.lua ./ - mv Editor/languages ./ mv Editor/fonts ./ - name: Package Editor @@ -135,7 +134,6 @@ jobs: with: name: Editor (Linux) path: | - languages/ fonts/ config.ini startup.lua diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5448e42a0..64168d935 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -127,7 +127,6 @@ jobs: mv build/Editor/WickedEngineEditor ./Editor_Linux mv Editor/config.ini ./ mv Editor/startup.lua ./ - mv Editor/languages ./ mv Editor/fonts ./ - name: Package Editor @@ -135,7 +134,6 @@ jobs: with: name: Editor (Linux) path: | - languages/ fonts/ config.ini startup.lua diff --git a/Editor/CMakeLists.txt b/Editor/CMakeLists.txt index 115c23101..d758cf1f9 100644 --- a/Editor/CMakeLists.txt +++ b/Editor/CMakeLists.txt @@ -39,7 +39,7 @@ add_custom_command( TARGET WickedEngineEditor POST_BUILD # Copy shader compiler library in the source folder COMMAND ${CMAKE_COMMAND} -E copy_if_different ${WICKED_ROOT_DIR}/WickedEngine/${LIB_DXCOMPILER} ${CMAKE_CURRENT_BINARY_DIR} - COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_SOURCE_DIR}/languages ${CMAKE_CURRENT_BINARY_DIR}/languages + #COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_SOURCE_DIR}/languages ${CMAKE_CURRENT_BINARY_DIR}/languages COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_SOURCE_DIR}/fonts ${CMAKE_CURRENT_BINARY_DIR}/fonts ) @@ -51,7 +51,7 @@ install(TARGETS WickedEngineEditor RUNTIME DESTINATION ${EDITOR_INSTALL_FOLDER}) # install editor assets install(DIRECTORY - "${CMAKE_CURRENT_SOURCE_DIR}/languages" + #"${CMAKE_CURRENT_SOURCE_DIR}/languages" "${CMAKE_CURRENT_SOURCE_DIR}/fonts" DESTINATION ${EDITOR_INSTALL_FOLDER}) # optional .ini .ico .lua