diff options
| author | Morten Johan Sorvig <morten.sorvig@nokia.com> | 2012-02-20 12:05:17 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-20 15:17:08 +0100 |
| commit | 1baa8d64728f9b72c1c5bae052939be7edb26224 (patch) | |
| tree | 9828c94ef41fcc7b8c06678c823425f8f9ecd55d /configure | |
| parent | d1dd2b2441f727f28817fcbc773c359c0f4e88b0 (diff) | |
Remove Native Client special casing from configure.
Change-Id: I20f044b267b6c18e5a3050de22710c45e7573cc3
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 61 |
1 files changed, 0 insertions, 61 deletions
@@ -278,12 +278,6 @@ earlyArgParse() VAL=$1 fi ;; - -nacl) - shift; - VAR=nacl - VAL=$1 - ;; - -h|help|--help|-help) if [ "$VAL" = "yes" ]; then OPT_HELP="$VAL" @@ -334,15 +328,6 @@ earlyArgParse() CFG_EMBEDDED=no fi ;; - nacl) - echo "Using NaCl at $VAL." - PLATFORM_X11=no - PLATFORM_MAC=no - PLATFORM_QWS=no - CFG_NACL_PATH=$VAL - CFG_EMBEDDED=nacl - ;; - developer-build) CFG_DEV="yes" ;; @@ -914,36 +899,6 @@ if [ -d "$relpath/src/plugins/imageformats" ]; then fi #------------------------------------------------------------------------------- -# Set Default NaCl options -#------------------------------------------------------------------------------- -if [ "$CFG_EMBEDDED" = "nacl" ]; then - echo "Setting NaCl options:" - echo "-static" - CFG_SHARED=no - echo "-qpa nacl" - PLATFORM_QPA=yes - echo "-fast" - OPT_FAST=yes - echo "-qconfig nacl" - CFG_QCONFIG=nacl - - if [ `uname` = "Linux" ]; then - I_FLAGS="$I_FLAGS -I${CFG_NACL_PATH}/toolchain/linux_x86/sdk/nacl-sdk/include" - L_FLAGS="$L_FLAGS -I${CFG_NACL_PATH}/toolchain/linux_x86/sdk/nacl-sdk/lib" - else - I_FLAGS="$I_FLAGS -I${CFG_NACL_PATH}/toolchain/mac_x86/sdk/nacl-sdk/include" - L_FLAGS="$L_FLAGS -I${CFG_NACL_PATH}/toolchain/mac_x86/sdk/nacl-sdk/lib" - fi - - echo "-no-mediaservices -no-sql-sqlite -nomake tests" - CFG_MEDIASERVICES=no - CFG_SQLITE=no - CFG_SQL_sqlite=no - CFG_NOBUILD_PARTS="$CFG_NOBUILD_PARTS tests" - QT_CONFIG="$QT_CONFIG nacl" -fi - -#------------------------------------------------------------------------------- # parse command line arguments #------------------------------------------------------------------------------- @@ -1040,10 +995,6 @@ while [ "$#" -gt 0 ]; do VAL=$1 fi ;; - -nacl) - VAR=nacl - shift; - ;; -opengl) VAR=opengl # this option may or may not be followed by an argument @@ -1270,8 +1221,6 @@ while [ "$#" -gt 0 ]; do PLATFORM_QWS=no PLATFORM_QPA=yes ;; - nacl) - ;; sse) if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then CFG_SSE="$VAL" @@ -3065,10 +3014,6 @@ if [ "$XPLATFORM_SYMBIAN_SBSV2" = "no" ]; then fi fi -if [ "$CFG_EMBEDDED" = "nacl" ]; then - TEST_COMPILER="nacl-gcc" -fi - SYSROOT_FLAG= if [ -n "$CFG_SYSROOT" ]; then if compilerSupportsFlag --sysroot="$CFG_SYSROOT"; then @@ -6429,12 +6374,6 @@ if [ "$PLATFORM_QPA" = "yes" ]; then rm -f "src/.moc/$QMAKE_OUTDIR/allmoc.cpp" # needs remaking if config changes fi -if [ "$CFG_EMBEDDED" = "nacl" ]; then - QMAKE_CONFIG="$QMAKE_CONFIG nacl pepper" - QT_CONFIG="$QT_CONFIG nacl pepper" - rm -f "src/.moc/$QMAKE_OUTDIR/allmoc.cpp" # needs remaking if config changes -fi - if [ "$XPLATFORM_MINGW" != "yes" ]; then # Do not set this here for Windows. Let qmake do it so # debug and release precompiled headers are kept separate. |