Merge branch 'master' into ld-preload

docs/BUILDING.md

@@ -4,8 +4,8 @@ You can compile an individual project by running `make <project>` or `make
 <project>_docker` to build the project inside a docker container.
 
 You can change whether you are compiling for the remarkable or a PC by
-adjusting the `ARCH` environment variable. See `src/actions.make` for the list
-of architectures, which include (but is not limited to) `dev` and `arm`
+adjusting the `TARGET` environment variable. See `src/actions.make` for the list
+of targets, which include (but is not limited to) `dev` and `arm`
 
 ## Compilation
 

src/nao/nao.sh

@@ -116,8 +116,7 @@ function SET() {
 
 function DISPLAY() {
     use_newline_separator
-    OUTPUT=`for line in ${SCENE[@]}; do echo $line; done`
-    RETURN=`echo "$OUTPUT" | LD_PRELOAD=${_PRELOAD} ${SIMPLE}`
+    RETURN=`echo "${SCENE[*]}" | ${SIMPLE}`
     use_space_separator
     SAVED_RETURN=${RETURN}
 }

src/rmkit/Makefile

@@ -12,4 +12,4 @@ APP=rmkit
 ASSET_DIR=assets/
 
 clean:
-	rm ${SRC_DIR}/build/${EXE}
+	rm -f ${SRC_DIR}/build/${EXE}

src/simple/main.cpy

@@ -350,7 +350,7 @@ def main():
       continue
 
     if tokens.size() < 5:
-      cerr << "line " << line_no << ": not enough tokens passed"
+      cerr << "line " << line_no << ": not enough tokens passed" << endl
       continue
 
     if !handle_widget(line_no, scene, tokens):