Merge branch 'main' into sse

platform/linux/app_start.cpp

@@ -1,6 +1,7 @@
 #include "../../game/skeldal.h"
 #include "../getopt.h"
 #include "../platform.h"
+#include "../error.h"
 #include <iostream>
 #include <string>
 
@@ -67,7 +68,7 @@ int main(int argc, char **argv) {
         }
 
     } catch (const std::exception &e) {
-        std::cerr << "ERROR: " << e.what() << std::endl;
+        std::cerr << "ERROR: " << exception_to_string(e) << std::endl;
         return 1;
     }
 

platform/linux/map_file.cpp

@@ -1,9 +1,7 @@
 
 
-extern "C" {
 #include "map_file.h"
 #include "../error.h"
-}
 
 #include <stdio.h>
 #include <stdlib.h>

platform/linux/map_file.h

@@ -1,4 +1,13 @@
 #include <stddef.h>
 #include <stdint.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 void *map_file_to_memory(const char *name, size_t *sz);
 void unmap_file(void *ptr, size_t sz);
+
+#ifdef __cplusplus
+}
+#endif

platform/linux/skeldal.sh

@@ -2,6 +2,7 @@
 temp_file=$(mktemp /tmp/skeldal.XXXXXX.log)
 CURDIR=`dirname "$0"`
 
+chmod +x "$CURDIR/skeldal_bin"
 LD_LIBRARY_PATH=$CURDIR:$LD_LIBRARY_PATH "$CURDIR/skeldal_bin" $* > "$temp_file" 2>&1
 
 exit_code=$?
@@ -25,4 +26,3 @@ fi
 rm $temp_file
 exit $exit_code
 
-