diff options
| -rw-r--r-- | plugins/MirLua/src/main.cpp | 2 | ||||
| -rw-r--r-- | plugins/MirLua/src/mlua.cpp | 3 | ||||
| -rw-r--r-- | plugins/MirLua/src/stdafx.h | 4 |
3 files changed, 8 insertions, 1 deletions
diff --git a/plugins/MirLua/src/main.cpp b/plugins/MirLua/src/main.cpp index ba04c136d2..3e560d91cb 100644 --- a/plugins/MirLua/src/main.cpp +++ b/plugins/MirLua/src/main.cpp @@ -6,6 +6,7 @@ HINSTANCE g_hInstance; CMLua *g_mLua;
+HANDLE g_hCLibsFolder;
HANDLE g_hScriptsFolder;
HANDLE hNetlib = NULL;
@@ -40,6 +41,7 @@ extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD) int OnModulesLoaded(WPARAM, LPARAM)
{
+ g_hCLibsFolder = FoldersRegisterCustomPathT(MODULE, "CLibsFolder", MIRLUA_PATHT, TranslateT("C libs folder"));
g_hScriptsFolder = FoldersRegisterCustomPathT(MODULE, "ScriptsFolder", MIRLUA_PATHT, TranslateT("Scripts folder"));
HookEvent(ME_OPT_INITIALISE, CLuaOptions::OnOptionsInit);
diff --git a/plugins/MirLua/src/mlua.cpp b/plugins/MirLua/src/mlua.cpp index 8fd617fce7..af6404573c 100644 --- a/plugins/MirLua/src/mlua.cpp +++ b/plugins/MirLua/src/mlua.cpp @@ -27,13 +27,14 @@ const int CMLua::GetHLangpack() const void CMLua::SetPaths()
{
TCHAR path[MAX_PATH];
- FoldersGetCustomPathT(g_hScriptsFolder, path, _countof(path), VARST(MIRLUA_PATHT));
lua_getglobal(L, "package");
+ FoldersGetCustomPathT(g_hCLibsFolder, path, _countof(path), VARST(MIRLUA_PATHT));
lua_pushfstring(L, "%s\\?.dll", ptrA(mir_utf8encodeT(path)));
lua_setfield(L, -2, "cpath");
+ FoldersGetCustomPathT(g_hScriptsFolder, path, _countof(path), VARST(MIRLUA_PATHT));
lua_pushfstring(L, "%s\\?.lua", ptrA(mir_utf8encodeT(path)));
lua_setfield(L, -2, "path");
diff --git a/plugins/MirLua/src/stdafx.h b/plugins/MirLua/src/stdafx.h index 90e60660d8..b9431c162e 100644 --- a/plugins/MirLua/src/stdafx.h +++ b/plugins/MirLua/src/stdafx.h @@ -68,6 +68,7 @@ extern HINSTANCE g_hInstance; extern CMLua *g_mLua;
+extern HANDLE g_hCLibsFolder;
extern HANDLE g_hScriptsFolder;
#ifdef _UNICODE
#define MIRLUA_PATHT MIRANDA_PATHW L"\\Scripts"
@@ -147,6 +148,9 @@ bool luaM_toboolean(lua_State *L, int idx); WPARAM luaM_towparam(lua_State *L, int idx);
LPARAM luaM_tolparam(lua_State *L, int idx);
+CMLuaScript* GetScriptFromEnviroment(lua_State *L, int n = 1);
+int GetScriptHLangpackFromEnviroment(lua_State *L, int n = 1);
+
void InitIcons();
HICON GetIcon(int iconId);
HANDLE GetIconHandle(int iconId);
|