From 95b70b1b169c7df97bd1dcf6eb8ca9aebe57ca57 Mon Sep 17 00:00:00 2001 From: rxi Date: Thu, 11 Jun 2020 15:05:39 +0100 Subject: [PATCH 1/4] Revert "Removed __APPLE__ `#ifdef` from main.c" This reverts commit 6a7e214d1cb7ecdd292dd2b17c17f2504904db4e. --- src/main.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main.c b/src/main.c index cf9baa13..6a772420 100644 --- a/src/main.c +++ b/src/main.c @@ -7,6 +7,8 @@ #include #elif __linux__ #include +#elif __APPLE__ + #include #endif From 7517d0ef552c89cc24e0589a8df8eb9648217e24 Mon Sep 17 00:00:00 2001 From: rxi Date: Sat, 13 Jun 2020 08:54:29 +0100 Subject: [PATCH 2/4] Changed EXEDIR to be used as default project dir --- data/core/init.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/core/init.lua b/data/core/init.lua index a9aa6a0e..cef305e8 100644 --- a/data/core/init.lua +++ b/data/core/init.lua @@ -82,7 +82,7 @@ function core.init() CommandView = require "core.commandview" Doc = require "core.doc" - local project_dir = "." + local project_dir = EXEDIR local files = {} for i = 2, #ARGS do local info = system.get_file_info(ARGS[i]) or {} From 1a82fd2b924fe277e83ee13a0c73e15666af4def Mon Sep 17 00:00:00 2001 From: rxi Date: Sat, 13 Jun 2020 13:35:36 +0100 Subject: [PATCH 3/4] Added `-fno-strict-aliasing` to build script --- build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sh b/build.sh index ffd1d01b..308ebf94 100755 --- a/build.sh +++ b/build.sh @@ -1,6 +1,6 @@ #!/bin/bash -cflags="-Wall -O3 -g -std=gnu11 -Isrc" +cflags="-Wall -O3 -g -std=gnu11 -fno-strict-aliasing -Isrc" lflags="-lSDL2 -lm" if [[ $* == *windows* ]]; then From 1db1f0bcebd54878a0415deda91c92b6e03acbd3 Mon Sep 17 00:00:00 2001 From: rxi Date: Sun, 14 Jun 2020 13:33:23 +0100 Subject: [PATCH 4/4] Version 1.08 --- src/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main.c b/src/main.c index 6a772420..a17c60e6 100644 --- a/src/main.c +++ b/src/main.c @@ -102,7 +102,7 @@ int main(int argc, char **argv) { } lua_setglobal(L, "ARGS"); - lua_pushstring(L, "1.07"); + lua_pushstring(L, "1.08"); lua_setglobal(L, "VERSION"); lua_pushstring(L, SDL_GetPlatform());