Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 # Copyright (c) 2014 The Native Client Authors. All rights reserved. | 1 # Copyright (c) 2014 The Native Client Authors. All rights reserved. |
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
| 4 | 4 |
| 5 EXECUTABLES="twm${NACL_EXEEXT}" | 5 EXECUTABLES="twm${NACL_EXEEXT}" |
| 6 NACLPORTS_CPPFLAGS+=" -Dmain=nacl_main" | |
| 7 | 6 |
| 8 NACLPORTS_LIBS+="\ | 7 NACLPORTS_LIBS+="\ |
| 9 -lXext -lXmu -lSM -lICE -lXt -lX11 -lxcb -lXau ${NACL_CLI_MAIN_LIB}" | 8 -lXext -lXmu -lSM -lICE -lXt -lX11 -lxcb -lXau ${NACL_CLI_MAIN_LIB}" |
|
binji
2015/10/27 21:52:38
ditto
Sam Clegg
2015/10/28 17:06:31
Done.
| |
| 10 | 9 |
| 11 EnableGlibcCompat | 10 EnableGlibcCompat |
| 12 | 11 |
| 13 if [ "${TOOLCHAIN}" = "pnacl" -o "${TOOLCHAIN}" = "clang-newlib" ]; then | 12 if [ "${TOOLCHAIN}" = "pnacl" -o "${TOOLCHAIN}" = "clang-newlib" ]; then |
| 14 NACLPORTS_CFLAGS+=" -Wno-return-type -Wno-parentheses -Wno-dangling-else" | 13 NACLPORTS_CFLAGS+=" -Wno-return-type -Wno-parentheses -Wno-dangling-else" |
| 15 NACLPORTS_CPPFLAGS+=" -std=gnu89" | 14 NACLPORTS_CPPFLAGS+=" -std=gnu89" |
| 16 fi | 15 fi |
| 17 | 16 |
| 18 BuildStep() { | 17 BuildStep() { |
| 19 RC=deftwmrc.c | 18 RC=deftwmrc.c |
| (...skipping 20 matching lines...) Expand all Loading... | |
| 40 PublishStep() { | 39 PublishStep() { |
| 41 MakeDir ${PUBLISH_DIR} | 40 MakeDir ${PUBLISH_DIR} |
| 42 ChangeDir ${PUBLISH_DIR} | 41 ChangeDir ${PUBLISH_DIR} |
| 43 LogExecute cp -f ${BUILD_DIR}/twm${NACL_EXEEXT} twm_${NACL_ARCH}${NACL_EXEEXT} | 42 LogExecute cp -f ${BUILD_DIR}/twm${NACL_EXEEXT} twm_${NACL_ARCH}${NACL_EXEEXT} |
| 44 LogExecute python ${NACL_SDK_ROOT}/tools/create_nmf.py\ | 43 LogExecute python ${NACL_SDK_ROOT}/tools/create_nmf.py\ |
| 45 twm_*${NACL_EXEEXT} -s . -o twm.nmf | 44 twm_*${NACL_EXEEXT} -s . -o twm.nmf |
| 46 LogExecute python ${TOOLS_DIR}/create_term.py -n twm twm.nmf | 45 LogExecute python ${TOOLS_DIR}/create_term.py -n twm twm.nmf |
| 47 InstallNaClTerm . | 46 InstallNaClTerm . |
| 48 LogExecute cp -f ${START_DIR}/*.js . | 47 LogExecute cp -f ${START_DIR}/*.js . |
| 49 } | 48 } |
| OLD | NEW |