From 7547152ab2c626adaffc024154af4ef418dbc8c0 Mon Sep 17 00:00:00 2001
From: Stepanov Igor <ygrik2003@yandex.ru>
Date: Sun, 15 Dec 2024 02:17:27 +0300
Subject: [PATCH] Fix resources linking

---
 CMakeLists.txt     | 24 +++++++++++++++---------
 src/CMakeLists.txt |  4 ++--
 2 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c357b46a..0ec3fa62 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -39,14 +39,14 @@ else()
   endif()
 endif()
 
-# if(VOXELENGINE_BUILD_WINDOWS_VCPKG AND WIN32)
-#   foreach(CONFIG_TYPE ${CMAKE_CONFIGURATION_TYPES})
-#     string(TOUPPER ${CONFIG_TYPE} CONFIG_TYPE_UPPER)
-#     add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD
-#                        COMMAND ${CMAKE_COMMAND} -E copy_directory
-#                        ${CMAKE_SOURCE_DIR}/res ${CMAKE_BINARY_DIR}/${CONFIG_TYPE_UPPER}/res)
-#   endforeach()
-# endif()
+if(VOXELENGINE_BUILD_WINDOWS_VCPKG AND WIN32)
+  foreach(CONFIG_TYPE ${CMAKE_CONFIGURATION_TYPES})
+    string(TOUPPER ${CONFIG_TYPE} CONFIG_TYPE_UPPER)
+    add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD
+                       COMMAND ${CMAKE_COMMAND} -E copy_directory
+                       ${CMAKE_SOURCE_DIR}/res ${CMAKE_BINARY_DIR}/${CONFIG_TYPE_UPPER}/res)
+  endforeach()
+endif()
 
 if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
     set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -no-pie -lstdc++fs")
@@ -58,7 +58,13 @@ endif()
 
 target_link_libraries(${PROJECT_NAME} VoxelEngineSrc ${CMAKE_DL_LIBS})
 
-file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/res DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
+add_custom_command(
+  TARGET ${PROJECT_NAME} 
+  POST_BUILD 
+  COMMAND ${CMAKE_COMMAND} -E copy_directory_if_different 
+          ${CMAKE_CURRENT_SOURCE_DIR}/res 
+          $<TARGET_FILE_DIR:${PROJECT_NAME}>/res
+  )
 
 if (VOXELENGINE_BUILD_TESTS)
     enable_testing()
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 1310bf28..b4fba12c 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -22,8 +22,8 @@ set(LIBS "")
 
 if (CMAKE_SYSTEM_NAME STREQUAL "Windows")
     if (MSVC)
-      set(LUA_LIBRARIES "${CMAKE_SOURCE_DIR}/vcpkg/packages/luajit_x64-windows/lib/lua51.lib")
-      set(LUA_INCLUDE_DIR "${CMAKE_SOURCE_DIR}/vcpkg/packages/luajit_x64-windows/include/luajit")
+      set(LUA_LIBRARIES "$ENV{VCPKG_ROOT}/packages/luajit_x64-windows/lib/lua51.lib")
+      set(LUA_INCLUDE_DIR "$ENV{VCPKG_ROOT}/packages/luajit_x64-windows/include/luajit")
     else()
       find_package(PkgConfig)
       pkg_check_modules(OpenAL REQUIRED IMPORTED_TARGET openal)