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

3 files changed, 5 insertions, 3 deletions

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
diff --git a/data/core/init.lua b/data/core/init.lua
index 0a03c5b0..fe74b344 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 {}
diff --git a/src/main.c b/src/main.c
index cf9baa13..a17c60e6 100644
--- a/src/main.c
+++ b/src/main.c
@@ -7,6 +7,8 @@
   #include <windows.h>
 #elif __linux__
   #include <unistd.h>
+#elif __APPLE__
+  #include <mach-o/dyld.h>
 #endif
 
 
@@ -100,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());