Changeset 2774


Ignore:
Timestamp:
Jun 23, 2013, 4:41:54 PM (8 years ago)
Author:
sam
Message:

build: activate the emscripten builds on the build bot.

Location:
trunk/build
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/build/build-html

    r2740 r2774  
    55
    66set -e
    7 ./build/lol-build "$@" bootstrap emscripten-html
    8 ./build/lol-build "$@" configure emscripten-html
    9 ./build/lol-build "$@" build emscripten-html
     7./build/lol-build "$@" bootstrap web-html
     8./build/lol-build "$@" configure web-html
     9./build/lol-build "$@" build web-html
    1010
  • trunk/build/lol-build

    r2740 r2774  
    3030#  - win*-amd64
    3131#  - raspi-arm
    32 #  - emscripten-html
    33 #  - emscripten-js
     32#  - web-html
     33#  - web-js
    3434#
    3535
     
    207207            CXXFLAGS="$CXXFLAGS -m64"
    208208            ;;
    209         emscripten-*)
     209        web-*)
    210210            # Force cross-compilation because AC_TRY_LINK is going to check
    211211            # whether our binaries have the executable bit set.
     
    275275            PATH="$PATH" PKG_CONFIG_PATH="$PKG_CONFIG_PATH" do_configure $HOSTFLAGS $BUILDFLAGS CPPFLAGS="$CPPFLAGS" LDFLAGS="$LDFLAGS" GTK_LIBS="$GTK_LIBS"
    276276            ;;
    277         emscripten-*)
    278             do_configure $HOSTFLAGS $BUILDFLAGS CC=emcc CXX=em++ AR=emar RANLIB=emranlib PKG_CONFIG=/bin/false SDL_CONFIG=/bin/false ac_cv_exeext=".${platform##emscripten-}"
     277        web-*)
     278            # We use --enable-release otherwise builds are really too slow
     279            do_configure --enable-release $HOSTFLAGS $BUILDFLAGS CC=emcc CXX=em++ AR=emar RANLIB=emranlib PKG_CONFIG=/bin/false SDL_CONFIG=/bin/false ac_cv_exeext=".${platform##web-}"
    279280            ;;
    280281        *)
  • trunk/build/run-bitten.sh

    r2703 r2774  
    190190if i686-w64-mingw32-g++ --version >/dev/null 2>&1; then
    191191    append "version = $(i686-w64-mingw32-g++ --version | sed -ne 's/.*g++ *([^)]*) *//p')"
     192fi
     193append ""
     194
     195#
     196# Emscripten
     197#
     198
     199append "[emscripten]"
     200if em++ --version >/dev/null 2>&1; then
     201    append "version = $(version | sed -ne 's/.*emcc.* \([0-9.]\{1,\}\).*/\1/p')"
    192202fi
    193203append ""
Note: See TracChangeset for help on using the changeset viewer.