update workflow

MihailRis · Dec 13, 2024 · 20a2817 · 20a2817
1 parent d25b8bc
commit 20a2817
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -24,7 +24,12 @@ jobs:
       - uses: msys2/setup-msys2@v2
         with:
             msystem: clang64
-            install: mingw-w64-clang-x86_64-toolchain mingw-w64-clang-x86_64-cmake mingw-w64-clang-x86_64-make git tree
+            install: >-
+                mingw-w64-clang-x86_64-toolchain 
+                mingw-w64-clang-x86_64-cmake 
+                mingw-w64-clang-x86_64-make 
+                mingw-w64-clang-x86_64-luajit 
+                git tree
       - name: Set up vcpkg
         shell: msys2 {0}
         run: |

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -31,7 +31,8 @@ if (WIN32)
         message(STATUS "LUA Libraries: ${LUA_LIBRARIES}")
         message(STATUS "LUA Include Dir: ${LUA_INCLUDE_DIR}")
         message(STATUS "${CMAKE_CURRENT_SOURCE_DIR}")
-        set(LUA_LIBRARIES "${CMAKE_CURRENT_SOURCE_DIR}/../build/vcpkg_installed/x64-mingw-dynamic/lib/libluajit.dll.a")
+        set(LUA_LIBRARIES "PkgConfig::LuaJIT")
+        #set(LUA_LIBRARIES "${CMAKE_CURRENT_SOURCE_DIR}/../build/vcpkg_installed/x64-mingw-dynamic/lib/libluajit.dll.a")
       endif()
       find_package(glfw3 REQUIRED)
       find_package(glm REQUIRED)