Fix lua path for lualibs

etternagame · Jun 30, 2018 · 609e5df · 609e5df
1 parent 02b7875
commit 609e5df
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/Themes/_fallback/Scripts/01 requires.lua b/Themes/_fallback/Scripts/01 requires.lua
@@ -1,3 +1,5 @@
+local current_dir=io.popen"cd":read'*l'
+package.path = package.path .. ";"..current_dir.."\\lualibs\\?.lua;"..current_dir.."\\lualibs\\?\\init.lua"
 require 'pl'
 class = require 'middleclass/middleclass'
 Req = {}

diff --git a/stepmania.nsi b/stepmania.nsi
@@ -284,6 +284,10 @@ Section "Main Section" SecMain
 	;CreateDirectory "$INSTDIR\CDTitles"
 	;SetOutPath "$INSTDIR\CDTitles"
 	;File "CDTitles\Instructions.txt"
+
+	; install lualibs
+	SetOutPath "$INSTDIR"
+	File /r /x CVS /x .svn "lualibs"
 
 	RMDir /r "$INSTDIR\Characters\default"
 	CreateDirectory "$INSTDIR\Characters\default"
@@ -499,6 +503,8 @@ Section "Main Section" SecMain
 	File "Program\LIBEAY32.dll"
 	File "Program\libuv.dll"
 	File "Program\zlib1.dll"
+	;libcurl
+	File "Program\libcurl.dll"
 	; parallel lights
 	File "Program\parallel_lights_io.dll"
 	; others
@@ -935,6 +941,7 @@ Section "Uninstall"
 	; others
 	Delete "$INSTDIR\Program\dbghelp.dll"
 	Delete "$INSTDIR\Program\jpeg.dll"
+	Delete "$INSTDIR\Program\libcurl.dll"
 	Delete "$INSTDIR\Program\parallel_lights_io.dll"
 	Delete "$INSTDIR\Program\zlib1.dll"
 	RMDir "$INSTDIR\Program"