equal
deleted
inserted
replaced
113 while read line; do case "$line" in |
113 while read line; do case "$line" in |
114 include*) |
114 include*) |
115 inc_file=`echo "$line" | sed -n -e "/^include.*(.*)/s/include.*(\(.*\)).*$/\1/p"` |
115 inc_file=`echo "$line" | sed -n -e "/^include.*(.*)/s/include.*(\(.*\)).*$/\1/p"` |
116 current_dir=`dirname "$1"` |
116 current_dir=`dirname "$1"` |
117 conf_file="$current_dir/$inc_file" |
117 conf_file="$current_dir/$inc_file" |
118 if [ ! -e "$conf_file" ]; then |
118 if [ ! -f "$conf_file" ]; then |
119 echo "WARNING: Unable to find file $conf_file" >&2 |
119 echo "WARNING: Unable to find file $conf_file" >&2 |
120 continue |
120 continue |
121 fi |
121 fi |
122 getQMakeConf1 "$conf_file" |
122 getQMakeConf1 "$conf_file" |
123 ;; |
123 ;; |
2303 rm -f "$outpath/tools/porting/src/q3porting.xml" |
2303 rm -f "$outpath/tools/porting/src/q3porting.xml" |
2304 ln -s "$relpath/tools/porting/src/q3porting.xml" "$outpath/tools/porting/src" |
2304 ln -s "$relpath/tools/porting/src/q3porting.xml" "$outpath/tools/porting/src" |
2305 fi |
2305 fi |
2306 |
2306 |
2307 # symlink fonts to be able to run application from build directory |
2307 # symlink fonts to be able to run application from build directory |
2308 if [ "$PLATFORM_QWS" = "yes" ] && [ ! -e "${outpath}/lib/fonts" ]; then |
2308 if [ "$PLATFORM_QWS" = "yes" ] && [ ! -d "${outpath}/lib/fonts" ]; then |
2309 if [ "$PLATFORM" = "$XPLATFORM" ]; then |
2309 if [ "$PLATFORM" = "$XPLATFORM" ]; then |
2310 mkdir -p "${outpath}/lib" |
2310 mkdir -p "${outpath}/lib" |
2311 ln -s "${relpath}/lib/fonts" "${outpath}/lib/fonts" |
2311 ln -s "${relpath}/lib/fonts" "${outpath}/lib/fonts" |
2312 fi |
2312 fi |
2313 fi |
2313 fi |
7604 OPENSSL_LINKAGE="(run-time)" |
7604 OPENSSL_LINKAGE="(run-time)" |
7605 elif [ "$CFG_OPENSSL" = "linked" ]; then |
7605 elif [ "$CFG_OPENSSL" = "linked" ]; then |
7606 OPENSSL_LINKAGE="(linked)" |
7606 OPENSSL_LINKAGE="(linked)" |
7607 fi |
7607 fi |
7608 echo "OpenSSL support ..... $CFG_OPENSSL $OPENSSL_LINKAGE" |
7608 echo "OpenSSL support ..... $CFG_OPENSSL $OPENSSL_LINKAGE" |
|
7609 echo "Alsa support ........ $CFG_ALSA" |
|
7610 echo |
7609 |
7611 |
7610 [ "$CFG_PTMALLOC" != "no" ] && echo "Use ptmalloc ........ $CFG_PTMALLOC" |
7612 [ "$CFG_PTMALLOC" != "no" ] && echo "Use ptmalloc ........ $CFG_PTMALLOC" |
7611 |
7613 |
7612 # complain about not being able to use dynamic plugins if we are using a static build |
7614 # complain about not being able to use dynamic plugins if we are using a static build |
7613 if [ "$CFG_SHARED" = "no" ]; then |
7615 if [ "$CFG_SHARED" = "no" ]; then |
7628 if [ "$PLATFORM_MAC" = "yes" ] && [ "$CFG_FRAMEWORK" = "yes" ] && [ "$CFG_DEBUG" = "yes" ] && [ "$CFG_DEBUG_RELEASE" = "no" ]; then |
7630 if [ "$PLATFORM_MAC" = "yes" ] && [ "$CFG_FRAMEWORK" = "yes" ] && [ "$CFG_DEBUG" = "yes" ] && [ "$CFG_DEBUG_RELEASE" = "no" ]; then |
7629 echo |
7631 echo |
7630 echo "NOTE: Mac OS X frameworks implicitly build debug and release Qt libraries." |
7632 echo "NOTE: Mac OS X frameworks implicitly build debug and release Qt libraries." |
7631 echo |
7633 echo |
7632 fi |
7634 fi |
7633 echo "alsa support ........ $CFG_ALSA" |
|
7634 echo |
|
7635 |
7635 |
7636 sepath=`echo "$relpath" | sed -e 's/\\./\\\\./g'` |
7636 sepath=`echo "$relpath" | sed -e 's/\\./\\\\./g'` |
7637 PROCS=1 |
7637 PROCS=1 |
7638 EXEC="" |
7638 EXEC="" |
7639 |
7639 |