Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ find_program(MSVC cl)
if(MSVC STREQUAL "MSVC-NOTFOUND")
message(FATAL_ERROR "MSVC compiler not found")
endif()
set(LUAROCKS_VERSION 3.9.2)
set(LUAROCKS_VERSION 3.11.1)
set(LUAROCKS_TARBALL luarocks-${LUAROCKS_VERSION}-windows-64.zip)

if(NOT EXISTS ${CMAKE_CURRENT_LIST_DIR}/${LUAROCKS_TARBALL})
Expand Down
16 changes: 15 additions & 1 deletion WixPatch.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,21 @@
Action='set'
Permanent='no'
Part='last'
Value='[INSTALL_ROOT]bin'
Value='[INSTALL_ROOT]bin;[AppDataFolder]luarocks\bin'
/>
<Environment
Id='CreateLuaPath'
Name='LUA_PATH'
Action='create'
Permanent='no'
Value='[INSTALL_ROOT]bin\lua\?.lua;[INSTALL_ROOT]bin\lua\?\init.lua;[INSTALL_ROOT]bin\?.lua;[INSTALL_ROOT]bin\?\init.lua;[INSTALL_ROOT]bin\..\share\lua\5.1\?.lua;[INSTALL_ROOT]bin\..\share\lua\5.1\?\init.lua;.\?.lua;.\?\init.lua;[AppDataFolder]luarocks\share\lua\5.1\?.lua;[AppDataFolder]luarocks\share\lua\5.1\?\init.lua'
/>
<Environment
Id='CreateLuaCPath'
Name='LUA_CPATH'
Action='create'
Permanent='no'
Value='[INSTALL_ROOT]bin\?.dll;[INSTALL_ROOT]bin\..\lib\lua\5.1\?.dll;[INSTALL_ROOT]bin\loadall.dll;.\?.dll;[AppDataFolder]luarocks\lib\lua\5.1\?.dll'
/>
<Environment
Id='UpdateConfig'
Expand Down