Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(116)

Unified Diff: examples/games/snes9x-1.53/nacl-snes9x-1.53.sh

Issue 11885025: Allow re-targeting of naclports install (Closed) Base URL: http://naclports.googlecode.com/svn/trunk/src
Patch Set: rebase Created 7 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « examples/games/scummvm-1.2.1/nacl-scummvm-1.2.1.sh ('k') | examples/graphics/xaos/nacl-xaos.sh » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: examples/games/snes9x-1.53/nacl-snes9x-1.53.sh
diff --git a/examples/games/snes9x-1.53/nacl-snes9x-1.53.sh b/examples/games/snes9x-1.53/nacl-snes9x-1.53.sh
index 71893f1bc4bf3c63221565610b9d203b5dda053b..bf31a3975662acc2c016134ec84398e5daf03579 100755
--- a/examples/games/snes9x-1.53/nacl-snes9x-1.53.sh
+++ b/examples/games/snes9x-1.53/nacl-snes9x-1.53.sh
@@ -22,22 +22,22 @@ CustomConfigureStep() {
# export the nacl tools
export CC=${NACLCC}
export CXX=${NACLCXX}
- export CXXFLAGS="-I${NACL_SDK_ROOT}/include"
- export LDFLAGS=""
+ export CXXFLAGS="${NACLPORTS_CFLAGS} -I${NACL_SDK_ROOT}/include"
+ export LDFLAGS="${NACLPORTS_LDFLAGS}"
if [ ${NACL_ARCH} = "pnacl" ] ; then
- export CXXFLAGS="-O3 -g"
- export LDFLAGS="-O0 -static"
+ export CXXFLAGS="${NACLPORTS_CFLAGS} -O3 -g"
+ export LDFLAGS="${NACLPORTS_LDFLAGS} -O0 -static"
fi
export AR=${NACLAR}
export RANLIB=${NACLRANLIB}
- export PKG_CONFIG_PATH=${NACL_SDK_USR_LIB}/pkgconfig
- export PKG_CONFIG_LIBDIR=${NACL_SDK_USR_LIB}
+ export PKG_CONFIG_PATH=${NACLPORTS_LIBDIR}/pkgconfig
+ export PKG_CONFIG_LIBDIR=${NACLPORTS_LIBDIR}
CONFIG_FLAGS="--host=nacl \
- --prefix=${NACL_SDK_USR} \
- --exec-prefix=${NACL_SDK_USR} \
- --libdir=${NACL_SDK_USR_LIB} \
- --oldincludedir=${NACL_SDK_USR_INCLUDE} \
+ --prefix=${NACLPORTS_PREFIX} \
+ --exec-prefix=${NACLPORTS_PREFIX} \
+ --libdir=${NACLPORTS_LIBDIR} \
+ --oldincludedir=${NACLPORTS_INCLUDE} \
--disable-gamepad \
--disable-gzip \
--disable-zip \
@@ -47,7 +47,7 @@ CustomConfigureStep() {
--without-x \
--enable-sound"
- export LIBS="-L${NACL_SDK_USR_LIB} \
+ export LIBS="-L${NACLPORTS_LIBDIR} \
-lnacl-mounts -lppapi_cpp -lppapi \
-lpthread -lstdc++"
« no previous file with comments | « examples/games/scummvm-1.2.1/nacl-scummvm-1.2.1.sh ('k') | examples/graphics/xaos/nacl-xaos.sh » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698