diff --git a/bootstrap b/bootstrap index 9a9a64c2..3deaacdb 100755 --- a/bootstrap +++ b/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 diff --git a/configure.ac b/configure.ac index 884e8cf4..5f4125c0 100644 --- a/configure.ac +++ b/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 diff --git a/test/Makefile.am b/test/Makefile.am index e9f6e65b..1526c577 100644 --- a/test/Makefile.am +++ b/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