Merge pull request #351 from spelunky-fyi/Fix

Another fix and update
spelunky-fyi · Oct 22, 2023 · b6c2d42 · b6c2d42
2 parents 975769f + 1b4f795
commit b6c2d42
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 3 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -16,6 +16,11 @@ jobs:
           fetch-depth: 1
           submodules: true
 
+      - name: Remove Strawberry Perl from PATH
+        run: |
+          $env:PATH = $env:PATH -replace "C:\\Strawberry\\c\\bin;", ""
+          "PATH=$env:PATH" | Out-File -FilePath $env:GITHUB_ENV -Append
+
       - name: Get tags for release notes
         shell: bash
         run: git fetch --depth=1 origin +refs/tags/*:refs/tags/*

diff --git a/.github/workflows/continous_integration.yml b/.github/workflows/continous_integration.yml
@@ -33,6 +33,11 @@ jobs:
           fetch-depth: 1
           submodules: true
 
+      - name: Remove Strawberry Perl from PATH
+        run: |
+          $env:PATH = $env:PATH -replace "C:\\Strawberry\\c\\bin;", ""
+          "PATH=$env:PATH" | Out-File -FilePath $env:GITHUB_ENV -Append
+
       - name: Configure
         run: |
           mkdir build

diff --git a/.github/workflows/whip-build.yml b/.github/workflows/whip-build.yml
@@ -18,6 +18,11 @@ jobs:
           fetch-depth: 1
           submodules: true
 
+      - name: Remove Strawberry Perl from PATH
+        run: |
+          $env:PATH = $env:PATH -replace "C:\\Strawberry\\c\\bin;", ""
+          "PATH=$env:PATH" | Out-File -FilePath $env:GITHUB_ENV -Append
+
       - name: Get tags for release notes
         shell: bash
         run: git fetch --depth=1 origin +refs/tags/*:refs/tags/*

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -20,8 +20,8 @@ target_include_directories(imgui PUBLIC imgui)
 # --------------------------------------------------
 # sol
 set(BUILD_LUA_AS_DLL OFF)
-set(SOL2_LUA_VERSION "5.4")
-set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/sol2/cmake/Modules")
+set(SOL2_LUA_VERSION "5.4.6")
+set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/sol2/cmake/Modules;${CMAKE_CURRENT_SOURCE_DIR}/sol2/cmake/Packages;${CMAKE_CURRENT_SOURCE_DIR}/sol2/cmake/Includes")
 find_package(LuaBuild REQUIRED COMPONENTS ${SOL2_LUA_VERSION})
 add_subdirectory(sol2)
 

diff --git a/src/sol2 b/src/sol2