Merge branch 'master' of https://github.com/tilkinsc/LuaConsole

Author: tilkinsc

.travis.yml

@@ -34,7 +34,7 @@ jobs:
       dist: trusty
     - stage: build
       script: ./travis.mac.sh
-      osx_image: xcode10.2
+      osx_image: xcode12.2
       os: osx
 
 

build.mac.sh

@@ -29,7 +29,7 @@
 [[ -z "${debug}" ]] &&			debug="0"
 [[ -z "${debug_coverage}" ]] &&	debug_coverage="0"
 [[ -z "${GCC}" ]] &&			GCC="gcc"
-[[ -z "${OBJCOPY}" ]] &&		OBJCOPY="objcopy"
+[[ -z "${OBJCOPY}" ]] &&		OBJCOPY="llvm-objcopy"
 [[ -z "${AR}" ]] &&				AR="ar"
 [[ -z "${MAKE}" ]] &&			MAKE="make"
 [[ -z "${GCC_VER}" ]] &&		GCC_VER="gnu99"
@@ -60,13 +60,13 @@ build and package accepts:
 Listens to these variables:
     debug, debug_coverage, GCC, OBJCOPY, AR, MAKE, GCC_VER
     
-    debug          - 0, 1               Default: 0
-    debug_coverage - 0, 1               Default: 0
-    GCC            - gcc binary         Default: gcc
-    OBJCOPY        - objcopy binary     Default: objcopy
-    AR             - ar binary          Default: ar
-    MAKE           - make binary        Default: make
-    GCC_VER        - stdlib version     Default: gnu99
+    debug          - 0, 1                   Default: 0
+    debug_coverage - 0, 1                   Default: 0
+    GCC            - gcc binary             Default: gcc
+    OBJCOPY        - llvm-objcopy binary    Default: llvm-objcopy
+    AR             - ar binary              Default: ar
+    MAKE           - make binary            Default: make
+    GCC_VER        - stdlib version         Default: gnu99
     
 Notes:
     After building, you may need to configure LD_LIBRARY_PATH to bin/Release/* to test
@@ -308,7 +308,7 @@ if [[ "$1" == "driver" ]]; then
 
 	# Build install
 	mv luaw "${root}"
-	cp -r ${resdir}/* "${root}/res"
+	cp -r ${resdir} "${root}/res"
 	cp -r ${rootdir}/* "${root}"
 	build_install "${2}"