build: various compilation fixes.

bootstrap

@@ -58,7 +58,8 @@ aclocalflags="`sed -ne 's/^[ \t]*ACLOCAL_AMFLAGS[ \t]*=//p' Makefile.am 2>/dev/n
 
 # Check for automake
 amvers="no"
-for v in 13 12 11 10 9 8 7 6 5; do
+v=20; vend=5
+while [ "$v" -gt "$vend" ]; do
   if automake-1.${v} --version >/dev/null 2>&1; then
     amvers="-1.${v}"
     break
@@ -66,6 +67,7 @@ for v in 13 12 11 10 9 8 7 6 5; do
     amvers="1.${v}"
     break
   fi
+  v="`expr "$v" - 1`"
 done
 
 if test "${amvers}" = "no" && automake --version > /dev/null 2>&1; then

configure.ac

@@ -537,6 +537,7 @@ AC_CONFIG_FILES(
   people/jnat/TestProject/Makefile
   people/peeweek/Makefile
   people/peeweek/private/Makefile
+  people/benlitz/Makefile
   people/benlitz/test1/Makefile
   people/benlitz/private/voxel/Makefile
   people/touky/Makefile

test/Makefile.am

@@ -37,10 +37,15 @@ btphystest_SOURCES = \
     physics/lolbtphysicsintegration.h physics/lolphysics.h \
     physics/easycharactercontroller.cpp physics/easycharactercontroller.h \
     physics/easyconstraint.cpp physics/easyconstraint.h \
-    physics/bulletcharactercontroller.cpp physics/bulletcharactercontroller.h
+    physics/bulletcharactercontroller.cpp physics/bulletcharactercontroller.h \
+    \
+    front_camera_sprite.lolfx
 btphystest_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/src/bullet \
     -DHAVE_PHYS_USE_BULLET
 btphystest_DEPENDENCIES = @LOL_DEPS@
+if USE_EMSCRIPTEN
+btphystest_LDFLAGS = --preload-file data/CatsSheet.png
+endif
 
 meshviewer_SOURCES = meshviewer.cpp \
     shinymvtexture.lolfx shinyfur.lolfx