diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-06-22 18:49:05 +0200 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-06-22 18:49:05 +0200 |
| commit | ad8b32a9d1cdb2ce4b478c70879c29ece123479d (patch) | |
| tree | 21e8c5589328cb064e8db99c1faaa76a45b80cab | |
| parent | 148e5f4c87e177364fd98d544b1c95783521b79c (diff) | |
| parent | fb79b929ad359d762ef79fb6ef0d3cafe0317aee (diff) | |
Merge branch 'master' into feature/gnumake4
| -rwxr-xr-x | configure.in | 4 | ||||
| -rw-r--r-- | solenv/gbuild/platform/ios.mk | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/configure.in b/configure.in index 5241c6ed78cc..3926aa249e88 100755 --- a/configure.in +++ b/configure.in @@ -5537,6 +5537,10 @@ if test "$_os" = "Darwin"; then fi fi +if test $_os = iOS -o $_os = Android; then + enable_gtk=no +fi + dnl *************************************** dnl testing for X libraries and includes... dnl *************************************** diff --git a/solenv/gbuild/platform/ios.mk b/solenv/gbuild/platform/ios.mk index c2215e2db109..d1ee20edee51 100644 --- a/solenv/gbuild/platform/ios.mk +++ b/solenv/gbuild/platform/ios.mk @@ -386,8 +386,8 @@ gb_SrsPartMergeTarget_TRANSEXPRECOMMAND := DYLD_LIBRARY_PATH=$(OUTDIR)/lib # SrsPartTarget class -gb_SrsPartTarget_RSCTARGET := $(OUTDIR)/bin/rsc -gb_SrsPartTarget_RSCCOMMAND := DYLD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$(OUTDIR)/bin $(gb_SrsPartTarget_RSCTARGET) +gb_SrsPartTarget_RSCTARGET := $(OUTDIR_FOR_BUILD)/bin/rsc +gb_SrsPartTarget_RSCCOMMAND := DYLD_LIBRARY_PATH=$(OUTDIR_FOR_BUILD)/lib SOLARBINDIR=$(OUTDIR_FOR_BUILD)/bin $(gb_SrsPartTarget_RSCTARGET) define gb_SrsPartTarget__command_dep $(call gb_Helper_abbreviate_dirs,\ |