Skip to content
This repository has been archived by the owner on Sep 4, 2019. It is now read-only.

Commit

Permalink
Redo the way TouchControlOverlay is included:
Browse files Browse the repository at this point in the history
-Don't hardcode directories in build_for_playbook.sh, make it a
configure test, but require it to be found on playbook.
-Don't include any paths for TouchControlOverlay - better to install it
first and get it from the ndk stage than to assume it is built using
momentics one directory up from the current directory.
-Don't hardcode the build platform, this can easily be auto-detected by
configure.
-Remove explicit header include paths, library include paths, and
variables that are unnecessary because configure will already set them
up
  • Loading branch information
Aaron Small committed Apr 8, 2012
1 parent d492015 commit c2ff46c
Show file tree
Hide file tree
Showing 3 changed files with 410 additions and 316 deletions.
16 changes: 3 additions & 13 deletions build_for_playbook.sh
Original file line number Diff line number Diff line change
Expand Up @@ -33,17 +33,12 @@ PREFIX=$(pwd)/playbook_prefix
# system has been known to forget that we are cross compiling
# and over-zealously look for x11 headers and find them in /usr/include.

RANLIB="${QNX_HOST}/usr/bin/ntoarmv7-ranlib " \
CPP="${QNX_HOST}/usr/bin/qcc -V4.4.2,gcc_ntoarmv7le_cpp -E " \
CC="${QNX_HOST}/usr/bin/qcc -V4.4.2,gcc_ntoarmv7le_cpp " \
LD="${QNX_HOST}/usr/bin/ntoarmv7-ld " \
CPPFLAGS="-D__PLAYBOOK__ -D__QNXNTO__ -I $(pwd)/../TouchControlOverlay/public " \
CPPFLAGS="-D__PLAYBOOK__ -D__QNXNTO__ " \
CFLAGS=" -g " \
LDFLAGS="-L$(pwd)/../TouchControlOverlay/Device-Debug -lTouchControlOverlay -L${QNX_TARGET}/armle-v7/lib -L${PREFIX}/lib -lscreen -lasound -lpps -lm -lpng14 -lbps -lxml2 -lEGL -lGLESv2" \
LDFLAGS="-lscreen -lasound -lpps -lm -lpng14 -lbps -lxml2 -lEGL -lGLESv2" \
PKG_CONFIG_PATH=${PREFIX}/lib/pkgconfig \
PKG_CONFIG_LIBDIR=${PREFIX}/lib/pkgconfig \
./configure --prefix="${PREFIX}" \
--build=i686-pc-linux \
--host=arm-unknown-nto-qnx6.5.0eabi \
--without-x \
--enable-pthreads \
Expand All @@ -62,16 +57,11 @@ PREFIX=${PREFIX} make install

cd test

RANLIB="${QNX_HOST}/usr/bin/ntoarmv7-ranlib " \
CPP="${QNX_HOST}/usr/bin/qcc -V4.4.2,gcc_ntoarmv7le_cpp -E " \
CC="${QNX_HOST}/usr/bin/qcc -V4.4.2,gcc_ntoarmv7le_cpp " \
LD="${QNX_HOST}/usr/bin/ntoarmv7-ld " \
CFLAGS="-g -D__PLAYBOOK__ -D__QNXNTO__ -I ${PREFIX}/include " \
LIBS="-L$(pwd)/../../TouchControlOverlay/Device-Debug -lTouchControlOverlay -L${QNX_TARGET}/armle-v7/lib -L${PREFIX}/lib -lscreen -lasound -lpps -lm -lpng14 -lbps -lxml2 -lEGL -lGLESv2 " \
LIBS="-L${PREFIX}/lib -lscreen -lasound -lpps -lm -lpng14 -lbps -lxml2 -lEGL -lGLESv2 " \
PKG_CONFIG_PATH=${PREFIX}/lib/pkgconfig \
PKG_CONFIG_LIBDIR=${PREFIX}/lib/pkgconfig \
./configure --prefix="${PREFIX}" \
--build=i686-pc-linux \
--host=arm-unknown-nto-qnx6.5.0eabi \
--without-x

Expand Down
Loading

0 comments on commit c2ff46c

Please sign in to comment.