diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2011-10-24 09:01:07 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2011-10-24 10:48:03 +0100 |
| commit | ccd38a0de63bd4289470fa286a53b79d23fe2b28 (patch) | |
| tree | f63f188442e164b25b923ed4487d6c191b0a4b3b /solenv | |
| parent | 7dca83c77cf20c943a338882b626e2b68d85ea77 (diff) | |
make --enable-layout have effect under gbuild
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/gbuild.mk | 23 |
1 files changed, 21 insertions, 2 deletions
diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk index 1cc724305cc3..03110a59d550 100644 --- a/solenv/gbuild/gbuild.mk +++ b/solenv/gbuild/gbuild.mk @@ -214,8 +214,6 @@ gb_CPUDEFS += -D$(CPUNAME) gb_GLOBALDEFS := \ -D_REENTRANT \ - -DENABLE_LAYOUT_EXPERIMENTAL=0 \ - -DENABLE_LAYOUT=0 \ -DOSL_DEBUG_LEVEL=$(gb_DEBUGLEVEL) \ -DSUPD=$(UPD) \ -DVCL \ @@ -223,6 +221,27 @@ gb_GLOBALDEFS := \ $(gb_COMPILERDEFS) \ $(gb_CPUDEFS) \ + +ifeq ($(strip $(ENABLE_LAYOUT)),TRUE) +gb_GLOBALDEFS += \ + -DENABLE_LAYOUT=1 \ + +else +gb_GLOBALDEFS += \ + -DENABLE_LAYOUT=0 \ + +endif + +ifeq ($(strip $(ENABLE_LAYOUT_EXPERIMENTAL)),TRUE) +gb_GLOBALDEFS += \ + -DENABLE_LAYOUT_EXPERIMENTAL=1 \ + +else +gb_GLOBALDEFS += \ + -DENABLE_LAYOUT_EXPERIMENTAL=0 \ + +endif + ifeq ($(gb_PRODUCT),$(true)) gb_GLOBALDEFS += \ -DPRODUCT \ |