Забыл закоммитить в revision 15024.

FarGroup · Jul 31, 2017 · 9e78ad8 · 9e78ad8
1 parent f0c0f87
commit 9e78ad8
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/plugins/luamacro/luamacro.lua b/plugins/luamacro/luamacro.lua
@@ -503,10 +503,11 @@ local function Init()
   utils.FixInitialModules()
   utils.InitMacroSystem()
   AddCfindFunction()
-  local modules = win.GetEnv("farprofile").."\\Macros\\modules\\"
+  local macros = win.GetEnv("farprofile").."\\Macros\\"
+  local modules = macros .. "modules\\"
   package.path = modules.."?.lua;"..modules.."?\\init.lua;"..package.path
   package.moonpath = modules.."?.moon;"..modules.."?\\init.moon;"..package.moonpath
-  package.cpath = modules.."?.dll;"..package.cpath
+  package.cpath = macros..(win.IsProcess64bit() and "lib64" or "lib32").."\\?.dll;"..package.cpath
 
   if _G.IsLuaStateRecreated then
     _G.IsLuaStateRecreated = nil