summaryrefslogtreecommitdiff
path: root/solenv
diff options
context:
space:
mode:
Diffstat (limited to 'solenv')
-rw-r--r--solenv/gbuild/gbuild.mk23
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 \