| OLD | NEW |
| 1 #!/bin/bash | 1 #!/bin/bash |
| 2 # Copyright (c) 2014 The Native Client Authors. All rights reserved. | 2 # Copyright (c) 2014 The Native Client Authors. All rights reserved. |
| 3 # Use of this source code is governed by a BSD-style license that can be | 3 # Use of this source code is governed by a BSD-style license that can be |
| 4 # found in the LICENSE file. | 4 # found in the LICENSE file. |
| 5 | 5 |
| 6 NACLPORTS_CPPFLAGS+=" -I${NACLPORTS_INCLUDE}/pixman-1" | 6 NACLPORTS_CPPFLAGS+=" -I${NACLPORTS_INCLUDE}/pixman-1" |
| 7 NACLPORTS_CPPFLAGS+=" -DFASYNC=O_NONBLOCK -DFNDELAY=O_NONBLOCK" | 7 NACLPORTS_CPPFLAGS+=" -DFASYNC=O_NONBLOCK -DFNDELAY=O_NONBLOCK" |
| 8 | 8 |
| 9 EXECUTABLES=hw/kdrive/sdl/Xsdl${NACL_EXEEXT} | 9 EXECUTABLES=hw/kdrive/sdl/Xsdl${NACL_EXEEXT} |
| 10 | 10 |
| (...skipping 15 matching lines...) Expand all Loading... |
| 26 | 26 |
| 27 if [ "${NACL_LIBC}" = "newlib" ]; then | 27 if [ "${NACL_LIBC}" = "newlib" ]; then |
| 28 EXTRA_CONFIGURE_ARGS+=" --enable-xvfb=no" | 28 EXTRA_CONFIGURE_ARGS+=" --enable-xvfb=no" |
| 29 EXTRA_CONFIGURE_ARGS+=" --enable-xorg=no" | 29 EXTRA_CONFIGURE_ARGS+=" --enable-xorg=no" |
| 30 fi | 30 fi |
| 31 | 31 |
| 32 NACLPORTS_CPPFLAGS+=" -Dmain=SDL_main" | 32 NACLPORTS_CPPFLAGS+=" -Dmain=SDL_main" |
| 33 export LIBS="\ | 33 export LIBS="\ |
| 34 ${NACL_CLI_MAIN_LIB} \ | 34 ${NACL_CLI_MAIN_LIB} \ |
| 35 -Wl,--undefined=SDL_main \ | 35 -Wl,--undefined=SDL_main \ |
| 36 -Wl,--undefined=nacl_main \ | |
| 37 -Wl,--undefined=nacl_startup_untar \ | 36 -Wl,--undefined=nacl_startup_untar \ |
| 38 -lSDLmain -lSDL -lRegal -lglslopt -lppapi_gles2 -lm \ | 37 -lSDLmain -lSDL -lRegal -lglslopt -lppapi_gles2 -lm \ |
| 39 -l${NACL_CXX_LIB}" | 38 -l${NACL_CXX_LIB}" |
| 40 | 39 |
| 41 PatchStep() { | 40 PatchStep() { |
| 42 DefaultPatchStep | 41 DefaultPatchStep |
| 43 MakeDir ${SRC_DIR}/hw/kdrive/sdl | 42 MakeDir ${SRC_DIR}/hw/kdrive/sdl |
| 44 LogExecute cp ${START_DIR}/sdl.c \ | 43 LogExecute cp ${START_DIR}/sdl.c \ |
| 45 ${START_DIR}/Makefile.am \ | 44 ${START_DIR}/Makefile.am \ |
| 46 ${SRC_DIR}/hw/kdrive/sdl/ | 45 ${SRC_DIR}/hw/kdrive/sdl/ |
| (...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 101 LogExecute tar cvf ${ASSEMBLY_DIR}/xorg-xkb.tar share/X11/xkb | 100 LogExecute tar cvf ${ASSEMBLY_DIR}/xorg-xkb.tar share/X11/xkb |
| 102 LogExecute shasum ${ASSEMBLY_DIR}/xorg-xkb.tar > \ | 101 LogExecute shasum ${ASSEMBLY_DIR}/xorg-xkb.tar > \ |
| 103 ${ASSEMBLY_DIR}/xorg-xkb.tar.hash | 102 ${ASSEMBLY_DIR}/xorg-xkb.tar.hash |
| 104 local XFONTS_DIR=${NACL_PACKAGES_PUBLISH}/xfonts/${TOOLCHAIN} | 103 local XFONTS_DIR=${NACL_PACKAGES_PUBLISH}/xfonts/${TOOLCHAIN} |
| 105 LogExecute cp ${XFONTS_DIR}/xorg-fonts.tar ${ASSEMBLY_DIR}/ | 104 LogExecute cp ${XFONTS_DIR}/xorg-fonts.tar ${ASSEMBLY_DIR}/ |
| 106 LogExecute cp ${XFONTS_DIR}/xorg-fonts.tar.hash ${ASSEMBLY_DIR}/ | 105 LogExecute cp ${XFONTS_DIR}/xorg-fonts.tar.hash ${ASSEMBLY_DIR}/ |
| 107 | 106 |
| 108 ChangeDir ${PUBLISH_DIR} | 107 ChangeDir ${PUBLISH_DIR} |
| 109 LogExecute zip -r xorg-server.zip xorg-server | 108 LogExecute zip -r xorg-server.zip xorg-server |
| 110 } | 109 } |
| OLD | NEW |