iqbalrifai
/
Aegisub
mirror of https://github.com/odrling/Aegisub
1
0
Fork 0
Code Issues Releases Wiki Activity

Add Aegisub's include dirs before the system ones rather than after

This commit is contained in:
Thomas Goyne 2014-07-07 09:06:47 -07:00
parent a11da3350c
commit a58ed7343d
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
libaegisub/lua/script_reader.cpp
View File

@ -123,20 +123,21 @@ namespace agi { namespace lua {
// set the module load path to include_path
lua_getglobal(L, "package");
push_value(L, "path");
#ifdef _WIN32
// No point in checking any of the default locations on Windows since
// there won't be anything there
push_value(L, "");
#else
push_value(L, "path");
lua_gettable(L, -3);
#endif
push_value(L, "");
for (auto const& path : include_path) {
lua_pushfstring(L, ";%s/?.lua;%s/?/init.lua", path.string().c_str(), path.string().c_str());
lua_pushfstring(L, "%s/?.lua;%s/?/init.lua;", path.string().c_str(), path.string().c_str());
lua_concat(L, 2);
}
#ifndef _WIN32
// No point in checking any of the default locations on Windows since
// there won't be anything there
push_value(L, "path");
lua_gettable(L, -4);
lua_concat(L, 2);
#endif
lua_settable(L, -3);
// Replace the default lua module loader with our unicode compatible one