walkero
/
lite-xl
1
0
Fork 0
Code Issues 7 Pull Requests Projects Releases 14 Wiki Activity

Added global EXEFILE

This commit is contained in:
rxi 2020-05-17 09:36:46 +01:00
parent 7e7602c53c
commit 82fdc63c6a
1 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/main.c
View File

@ -28,7 +28,7 @@ static double get_scale(void) {
} }
static void get_exe_dir(char *buf, int sz) { static void get_exe_filename(char *buf, int sz) {
#if _WIN32 #if _WIN32
int len = GetModuleFileName(NULL, buf, sz - 1); int len = GetModuleFileName(NULL, buf, sz - 1);
buf[len] = '\0'; buf[len] = '\0';
@ -41,15 +41,8 @@ static void get_exe_dir(char *buf, int sz) {
unsigned size = sz; unsigned size = sz;
_NSGetExecutablePath(buf, &size); _NSGetExecutablePath(buf, &size);
#else #else
strcpy(buf, "."); strcpy(buf, "./lite");
#endif #endif
for (int i = strlen(buf) - 1; i > 0; i--) {
if (buf[i] == '/' || buf[i] == '\\') {
buf[i] = '\0';
break;
}
}
} }
@ -116,10 +109,10 @@ int main(int argc, char **argv) {
lua_pushnumber(L, get_scale()); lua_pushnumber(L, get_scale());
lua_setglobal(L, "SCALE"); lua_setglobal(L, "SCALE");
char exedir[2048]; char exename[2048];
get_exe_dir(exedir, sizeof(exedir)); get_exe_filename(exename, sizeof(exename));
lua_pushstring(L, exedir); lua_pushstring(L, exename);
lua_setglobal(L, "EXEDIR"); lua_setglobal(L, "EXEFILE");
(void) luaL_dostring(L, (void) luaL_dostring(L,
@ -127,6 +120,7 @@ int main(int argc, char **argv) {
"xpcall(function()\n" "xpcall(function()\n"
" SCALE = tonumber(os.getenv(\"LITE_SCALE\")) or SCALE\n" " SCALE = tonumber(os.getenv(\"LITE_SCALE\")) or SCALE\n"
" PATHSEP = package.config:sub(1, 1)\n" " PATHSEP = package.config:sub(1, 1)\n"
" EXEDIR = EXEFILE:match(\"^(.-)[^/\\\\]*$\")"
" package.path = EXEDIR .. '/data/?.lua;' .. package.path\n" " package.path = EXEDIR .. '/data/?.lua;' .. package.path\n"
" package.path = EXEDIR .. '/data/?/init.lua;' .. package.path\n" " package.path = EXEDIR .. '/data/?/init.lua;' .. package.path\n"
" core = require('core')\n" " core = require('core')\n"