diff options
| author | sbc@chromium.org <sbc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-28 17:18:08 +0000 |
|---|---|---|
| committer | sbc@chromium.org <sbc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-28 17:18:08 +0000 |
| commit | 5f85973d81da8ba07f289ef48add098808165988 (patch) | |
| tree | 5d343cfa7e17c70185247c4bfd7f21ec323a3395 /native_client_sdk/src/gonacl_appengine | |
| parent | 53c7477ab3cd6c08c0ef3063af55ec56c0c65f7f (diff) | |
| download | chromium_src-5f85973d81da8ba07f289ef48add098808165988.zip chromium_src-5f85973d81da8ba07f289ef48add098808165988.tar.gz chromium_src-5f85973d81da8ba07f289ef48add098808165988.tar.bz2 | |
[NaCl SDL] Update naclports revision used to build gonacl samples.
The recent addition of $NACL_SDK_ROOT/include/pnacl/stdlib.h
requires an even more recent version of naclports.
TEST=build_sdk.py --build-ports --build-app-engine
R=binji@chromium.org
Review URL: https://codereview.chromium.org/298273006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@273278 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'native_client_sdk/src/gonacl_appengine')
4 files changed, 5 insertions, 5 deletions
diff --git a/native_client_sdk/src/gonacl_appengine/src/bullet/Makefile b/native_client_sdk/src/gonacl_appengine/src/bullet/Makefile index a2e76da..0d436fa 100644 --- a/native_client_sdk/src/gonacl_appengine/src/bullet/Makefile +++ b/native_client_sdk/src/gonacl_appengine/src/bullet/Makefile @@ -13,7 +13,7 @@ include $(NACL_SDK_ROOT)/tools/common.mk TARGET = NaClAMBullet LIBS = BulletDynamics BulletCollision LinearMath ppapi pthread -USR_INCLUDE=$(NACL_SDK_ROOT)/toolchain/$(OSNAME)_pnacl/usr/include +USR_INCLUDE=$(NACL_SDK_ROOT)/toolchain/$(OSNAME)_pnacl/usr/local/include BULLET_INCLUDE=$(USR_INCLUDE)/bullet CFLAGS = -I$(CURDIR) -I$(BULLET_INCLUDE) diff --git a/native_client_sdk/src/gonacl_appengine/src/bullet/build.sh b/native_client_sdk/src/gonacl_appengine/src/bullet/build.sh index 5f6152e..1bcd12e 100755 --- a/native_client_sdk/src/gonacl_appengine/src/bullet/build.sh +++ b/native_client_sdk/src/gonacl_appengine/src/bullet/build.sh @@ -11,7 +11,7 @@ cd ${SCRIPT_DIR} OUT_DIR=out NACLPORTS_URL=https://chromium.googlesource.com/external/naclports -NACLPORTS_SHA=0096083c0fa71c014f6218bb14d7e1742d9a6b0c +NACLPORTS_SHA=04ba2e1abe8557ef888b653b7a0da974e4734641 NACLPORTS_DIR=${OUT_DIR}/naclports NACLAM_URL=https://github.com/johnmccutchan/NaClAMBase NACLAM_DIR=${OUT_DIR}/NaClAMBase diff --git a/native_client_sdk/src/gonacl_appengine/src/lua/build.sh b/native_client_sdk/src/gonacl_appengine/src/lua/build.sh index 832a6e8f..1a01e52 100755 --- a/native_client_sdk/src/gonacl_appengine/src/lua/build.sh +++ b/native_client_sdk/src/gonacl_appengine/src/lua/build.sh @@ -12,7 +12,7 @@ cd ${SCRIPT_DIR} OUT_DIR=out NACLPORTS_URL=http://naclports.googlecode.com/svn/trunk/src -NACLPORTS_REV=1174 +NACLPORTS_REV=1290 NACLPORTS_DIR=${OUT_DIR}/naclports if [ -z "${NACL_SDK_ROOT:-}" ]; then @@ -68,7 +68,7 @@ popd Banner Building lua pushd ${NACLPORTS_DIR}/src -make NACL_ARCH=pnacl lua_ppapi +make TOOLCHAIN=pnacl lua-ppapi popd Banner Done! diff --git a/native_client_sdk/src/gonacl_appengine/src/smoothlife/build.sh b/native_client_sdk/src/gonacl_appengine/src/smoothlife/build.sh index 4e641b0..84c33b7 100755 --- a/native_client_sdk/src/gonacl_appengine/src/smoothlife/build.sh +++ b/native_client_sdk/src/gonacl_appengine/src/smoothlife/build.sh @@ -12,7 +12,7 @@ cd ${SCRIPT_DIR} OUT_DIR=out SMOOTHLIFE_URL=https://github.com/binji/smoothnacl SMOOTHLIFE_DIR=${OUT_DIR}/smoothlife -SMOOTHLIFE_SHA=165b31df45b3f1ec76ec227a4086c80823e415cf +SMOOTHLIFE_SHA=e81cf2b00290add556dcdc8aa84506ca007bc853 if [ -z "${NACL_SDK_ROOT:-}" ]; then echo "-------------------------------------------------------------------" |