Changeset 2882


Ignore:
Timestamp:
Sep 9, 2013, 4:58:15 PM (6 years ago)
Author:
sam
Message:

build: various compilation fixes.

Location:
trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/bootstrap

    r2850 r2882  
    5959# Check for automake
    6060amvers="no"
    61 for v in 13 12 11 10 9 8 7 6 5; do
     61v=20; vend=5
     62while [ "$v" -gt "$vend" ]; do
    6263  if automake-1.${v} --version >/dev/null 2>&1; then
    6364    amvers="-1.${v}"
     
    6768    break
    6869  fi
     70  v="`expr "$v" - 1`"
    6971done
    7072
  • trunk/configure.ac

    r2861 r2882  
    538538  people/peeweek/Makefile
    539539  people/peeweek/private/Makefile
     540  people/benlitz/Makefile
    540541  people/benlitz/test1/Makefile
    541542  people/benlitz/private/voxel/Makefile
  • trunk/test/Makefile.am

    r2849 r2882  
    3838    physics/easycharactercontroller.cpp physics/easycharactercontroller.h \
    3939    physics/easyconstraint.cpp physics/easyconstraint.h \
    40     physics/bulletcharactercontroller.cpp physics/bulletcharactercontroller.h
     40    physics/bulletcharactercontroller.cpp physics/bulletcharactercontroller.h \
     41    \
     42    front_camera_sprite.lolfx
    4143btphystest_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/src/bullet \
    4244    -DHAVE_PHYS_USE_BULLET
    4345btphystest_DEPENDENCIES = @LOL_DEPS@
     46if USE_EMSCRIPTEN
     47btphystest_LDFLAGS = --preload-file data/CatsSheet.png
     48endif
    4449
    4550meshviewer_SOURCES = meshviewer.cpp \
Note: See TracChangeset for help on using the changeset viewer.