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

Merge remote-tracking branch 'rxi/master' into agg-font-renderer

This commit is contained in:
Francesco Abbate 2020-06-16 15:00:47 +02:00
parent 2c6bd874fa 1db1f0bceb
commit fe0dda8309
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.sh
View File

@ -1,6 +1,6 @@
#!/bin/bash #!/bin/bash
cflags="-Wall -O3 -g -std=gnu11 -Isrc" cflags="-Wall -O3 -g -std=gnu11 -fno-strict-aliasing -Isrc"
lflags="-lSDL2 -lm" lflags="-lSDL2 -lm"
if [[ $* == *windows* ]]; then if [[ $* == *windows* ]]; then

2
data/core/init.lua
View File

@ -82,7 +82,7 @@ function core.init()
CommandView = require "core.commandview" CommandView = require "core.commandview"
Doc = require "core.doc" Doc = require "core.doc"
local project_dir = "." local project_dir = EXEDIR
local files = {} local files = {}
for i = 2, #ARGS do for i = 2, #ARGS do
local info = system.get_file_info(ARGS[i]) or {} local info = system.get_file_info(ARGS[i]) or {}

4
src/main.c
View File

@ -7,6 +7,8 @@
#include <windows.h> #include <windows.h>
#elif __linux__ #elif __linux__
#include <unistd.h> #include <unistd.h>
#elif __APPLE__
#include <mach-o/dyld.h>
#endif #endif
@ -100,7 +102,7 @@ int main(int argc, char **argv) {
} }
lua_setglobal(L, "ARGS"); lua_setglobal(L, "ARGS");
lua_pushstring(L, "1.07"); lua_pushstring(L, "1.08");
lua_setglobal(L, "VERSION"); lua_setglobal(L, "VERSION");
lua_pushstring(L, SDL_GetPlatform()); lua_pushstring(L, SDL_GetPlatform());