From ff0ac8b2794464a951eeb113fb0eb1c8def59a6a Mon Sep 17 00:00:00 2001
From: poikilos <7557867+poikilos@users.noreply.github.com>
Date: Sun, 28 Mar 2021 16:33:19 -0400
Subject: [PATCH] Move freetype search dir from debug to project...

Improve formatting of readme and output.
---
 build.sh   |  7 ++++++-
 install.sh | 10 +++++-----
 readme.md  |  6 ++++--
 3 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/build.sh b/build.sh
index a2cb77c..c9dc70a 100755
--- a/build.sh
+++ b/build.sh
@@ -89,7 +89,12 @@ if [ -f "$$OUT_BIN" ]; then
 fi
 g++  -o build/b3view $OBJDIR/main.o $OBJDIR/Engine.o $OBJDIR/EventHandler.o $OBJDIR/UserInterface.o $OBJDIR/Debug.o $OBJDIR/View.o $OBJDIR/CGUITTFont.o $OBJDIR/Utility.o $OBJDIR/settings.o -lIrrlicht -lX11 -lGL -lXxf86vm -lXcursor -lstdc++fs -lfreetype
 if [ $? -ne 0 ]; then
-    echo "* linking failed."
+    cat <<END
+Error: Linking failed. Ensure you have installed:
+- irrlicht-devel and its dependencies: mesa-libGL-devel (requires libglvnd-devel which requires libX11-devel) libXxf86vm-devel
+- libXcursor-devel
+- freetype-devel
+END
 else
     echo "* linking succeeded."
 fi
diff --git a/install.sh b/install.sh
index 0f2f904..91eaf71 100755
--- a/install.sh
+++ b/install.sh
@@ -66,21 +66,21 @@ for try_build_path in  "$BUILD_DIR" "../build" "../../build-$project_unix_name-D
 do
     try_src_path="$try_build_path/$src_name"
     if [ ! -f $src_path ]; then
-        echo "Checking for $src_path...NOT FOUND"
+        echo "* checking for $src_path...NOT FOUND"
         if [ -f "$try_src_path" ]; then
-            echo "* Checking for $src_name in $try_build_path...FOUND"
+            echo "* checking for $src_name in $try_build_path...FOUND"
             src_path="$try_src_path"
             break
         else
-            echo "* Checking for $src_name in $try_build_path...NOT FOUND"
+            echo "* checking for $src_name in $try_build_path...NOT FOUND"
         fi
     fi
 done
 if [ ! -f "$src_path" ]; then
     customExit "(Nothing done) missing $src_name (You must build first, such as using build.sh or Qt Creator (Release))."
 else
-    echo "Checking for $src_path...FOUND"
-    echo "* current directory: `pwd`"
+    echo "* checking for \"$src_path\"...FOUND"
+    echo "* current directory: \"`pwd`\""
 fi
 
 if [ -d "$dest_bin" ]; then
diff --git a/readme.md b/readme.md
index e214233..d4a53e8 100644
--- a/readme.md
+++ b/readme.md
@@ -33,7 +33,7 @@ If not using Code::Blocks, compile using the included `./build.sh` (requires bas
 
 CodeBlocks says it is looking for boost_filesystem and boost_system, which may be due to Irrlicht.
 * libbost-filesystem-dev
-    - In CodeBlocks (once per computer): Settings, Compiler, Search paths, /usr/include/freetype2
+  - In CodeBlocks (once per computer): Settings, Compiler, Search paths, /usr/include/freetype2
 * libboost-system-dev
 
 ## Main Features in poikilos fork
@@ -107,9 +107,10 @@ with other formats which also have the B3D extension.
 ### Linux
 * To generate a working makefile, edit the .pro file to reflect your
   path settings and run:
-```bash
+  ```bash
 qmake make -f Makefile.Debug
 ```
+
 This will (hopefully) build a binary in the "build" subdirectory.
 See [Troubleshooting](#Troubleshooting) for compiling via GUI.
 
@@ -221,6 +222,7 @@ only applies to Visual Studio users.)
 ### Command-line arguments
 - `--test-and-exit`: This option is primarily for test scripts to run the program and see if it is working. It loads "dist/share/b3view/meshes/penguin-lowpoly-poikilos.b3d", loads the next texture, and (may perform other tests and) exits. It only works if the file exists such as if you are running from the repo directory.
 
+
 ## Known Issues
 * Warn on missing texture.
 * Test and complete install.bat on Windows.