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

Unified Diff: examples/games/scummvm-1.2.1/nacl-scummvm-1.2.1.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/nethack-3.4.3/nacl-nethack-3.4.3.sh ('k') | examples/games/snes9x-1.53/nacl-snes9x-1.53.sh » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: examples/games/scummvm-1.2.1/nacl-scummvm-1.2.1.sh
diff --git a/examples/games/scummvm-1.2.1/nacl-scummvm-1.2.1.sh b/examples/games/scummvm-1.2.1/nacl-scummvm-1.2.1.sh
index 54ec0bda41af503b50ecd8d338e5a1a6166ccd49..7d7b9cb2203a31f9dfc6e7836a01b3231d5813d0 100755
--- a/examples/games/scummvm-1.2.1/nacl-scummvm-1.2.1.sh
+++ b/examples/games/scummvm-1.2.1/nacl-scummvm-1.2.1.sh
@@ -42,10 +42,10 @@ CustomConfigureStep() {
# without this setting *make* will not show the full command lines
export VERBOSE_BUILD=1
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}
export PATH="${NACL_BIN_PATH}:${PATH}"
- export PATH="${NACL_SDK_USR_BIN}:${PATH}"
+ export PATH="${NACLPORTS_PREFIX_BIN}:${PATH}"
export DEFINES=
if [ "${NACL_GLIBC}" != "1" ]; then
export DEFINES="-Dstrdup\(a\)=strcpy\(\(char\*\)malloc\(strlen\(a\)+1\),a\)"
@@ -72,7 +72,7 @@ CustomConfigureStep() {
cd ${PACKAGE_NAME}-build
../configure \
--host=nacl \
- --libdir=${NACL_SDK_USR_LIB} \
+ --libdir=${NACLPORTS_LIBDIR} \
--disable-flac \
--disable-zlib \
--disable-mt32emu \
« no previous file with comments | « examples/games/nethack-3.4.3/nacl-nethack-3.4.3.sh ('k') | examples/games/snes9x-1.53/nacl-snes9x-1.53.sh » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698