diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 78fb97d8c..3f7efc9c3 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -41,7 +41,6 @@ jobs: timeout-minutes: 1 - name: Package for Windows run: | - tree mkdir packaged cp -r build/Release/* packaged/ cp build/vctest/Release/vctest.exe packaged/ diff --git a/CMakeLists.txt b/CMakeLists.txt index d5be47d46..e7ec6ce45 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -38,7 +38,10 @@ target_link_options(VoxelEngine PRIVATE $<$:-no-pie>) # Deploy res to build dir if (NOT EXISTS ${CMAKE_CURRENT_BINARY_DIR}/res) - file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/res DESTINATION ${CMAKE_CURRENT_BINARY_DIR}) + if (NOT DEFINED CMAKE_RUNTIME_OUTPUT_DIRECTORY) + set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}) + endif() + file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/res DESTINATION ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}) endif() if(VOXELENGINE_BUILD_TESTS)