Merge pull request #26 from kramg/master

Minor change to build.txt

build/build.txt

@@ -1,43 +1,64 @@
 # Instructions to build fruitbox from source code on Raspberry Pi
 # ---------------------------------------------------------------
 
+# Assumes you have downloaded (wget https://codeload.github.com/chundermike/rpi-fruitbox/zip/master)
+# and unzipped fruitbox master into the pi home directory and run apt-get update.
+
+cd ~/rpi-fruitbox-master/build/ # fruitbox build directory where the mpg & allegro tarballs reside
+
 # install and build libmpg123 as static library...
 
-cd ~
 tar -xvf mpg123-1.24.0.tar
 cd ~/mpg123-1.24.0
 chmod +x configure
 ./configure --with-cpu=arm_fpu --disable-shared
 make && sudo make install
 
-
 # install allegro dependencies...
+
 sudo apt-get install build-essential git cmake xorg-dev libgl1-mesa-dev libgles2-mesa-dev libglu-dev
+
+# you can ignore any note about selecting 'libglu1-mesa-dev' instead of 'libglu-dev'
+
 sudo apt-get install libdumb1 libjpeg-dev libfreetype6-dev libpng-dev libasound-dev libxcursor-dev
+
+# you can ignore any note about selecting 'libasound2-dev' instead of 'libasound-dev'
+
 sudo apt-get install libvorbis-dev libtheora-dev
 
 #touch support (jessie only?)...
 sudo apt-get install libts-dev
 
 # install and build allegro as static library...
 # If using raspbian stretch distribution do the follwoing five lines...
+
 cd /opt/vc/lib
 sudo ln -s libbrcmEGL.so libEGL.so
 sudo ln -s libbrcmGLESv2.so libGLESv2.so
 sudo ln -s libbrcmOpenVG.so libOpenVG.so
 sudo ln -s libbrcmWFC.so libWFC.so
 
-cd ~
+cd ~/rpi-fruitbox-master/build # back to the fruitbox build directory
+
 tar -xvf allegro-5.2.4.0.tar
 cd allegro-5.2.4.0
 mkdir build && cd build
 cmake .. -DCMAKE_TOOLCHAIN_FILE=../cmake/Toolchain-raspberrypi.cmake -DSHARED=off
+
+# you can ingore the warnings about libwebp, libFLAC, libdumb and libopus not being found
+# they aren't needed for fruitbox.
+
 make && sudo make install
-export PKG_CONFIG_PATH=/home/pi/allegro-5.2.4.0/build/lib/pkgconfig
-sudo ldconfig
+
+# you can ignore the warnings about: unused 'display', 'maximized' and 'info' parameters; the signedness
+# of pointer targets for ‘eglGetProcAddress’and ‘load_extension’; ‘ogl_flip_blocks’ being defined but not
+# used; and, the implicit declaration of function ‘glFramebufferTexture2DMultisampleEXT’.
 
 # build fruitbox...
 
-cd ~
-cd build
+cd ~/rpi-fruitbox-master/build # back to the fruitbox build directory
+
+# Note that this final make will overwrite any existing fruitbox executable in the rpi-fruitbox-master
+# directory so you may wish to back it up before proceeding.
+
 make