diff options
| author | Tor Lillqvist <tlillqvist@suse.com> | 2011-10-03 10:06:05 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tlillqvist@suse.com> | 2011-10-03 10:37:27 +0300 |
| commit | bc88d9b76d9c7ed75e26340d5e6c6c9b45fefc20 (patch) | |
| tree | 95cbe2aa34f5e15d30367289b0d2fa20ccca7ce4 /solenv | |
| parent | WaE: suggest braces around empty body in an 'else' statement (diff) | |
| download | core-bc88d9b76d9c7ed75e26340d5e6c6c9b45fefc20.tar.gz core-bc88d9b76d9c7ed75e26340d5e6c6c9b45fefc20.zip | |
No need for -DCUI or -DGUI
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/gbuild.mk | 1 | ||||
| -rw-r--r-- | solenv/inc/settings.mk | 6 |
2 files changed, 0 insertions, 7 deletions
diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk index 4116b6ce3ad1..d21e7356393d 100644 --- a/solenv/gbuild/gbuild.mk +++ b/solenv/gbuild/gbuild.mk @@ -206,7 +206,6 @@ gb_CPUDEFS += -D$(CPUNAME) gb_GLOBALDEFS := \ -D_REENTRANT \ - -DCUI \ -DENABLE_LAYOUT_EXPERIMENTAL=0 \ -DENABLE_LAYOUT=0 \ -DOSL_DEBUG_LEVEL=$(gb_DEBUGLEVEL) \ diff --git a/solenv/inc/settings.mk b/solenv/inc/settings.mk index 753decb1b792..75262da2634a 100644 --- a/solenv/inc/settings.mk +++ b/solenv/inc/settings.mk @@ -167,8 +167,6 @@ CXXDEFS= CDEFSCXX= CDEFSOBJ= CDEFSSLO= -CDEFSGUI= -CDEFSCUI= CDEFSMT= CDEFSPROF= CDEFSDEBUG= @@ -889,8 +887,6 @@ CDEFSSLO= .ELSE CDEFSSLO=-DSHAREDLIB -D_DLL_ .ENDIF -CDEFSGUI=-DGUI -CDEFSCUI=-DCUI #CDEFSMT=-DMULTITHREAD CDEFSPROF=-DPROFILE .IF "$(dbg_build_only)" == "" @@ -1201,7 +1197,6 @@ CDEFS += -DHAVE_THREADSAFE_STATICS # compose flags and defines for GUI .IF "$(TARGETTYPE)"=="GUI" -CDEFS+= $(CDEFSGUI) CFLAGSSLO+=$(CFLAGSSLOGUIMT) CDEFSSLO+=$(CDEFSSLOMT) LINKFLAGSAPP=$(LINKFLAGSAPPGUI) @@ -1218,7 +1213,6 @@ STDSHL=$(STDSHLGUIMT) # compose flags and defines for CUI .IF "$(TARGETTYPE)" == "CUI" || "$(TARGETTYPE)"=="cui" -CDEFS+= $(CDEFSCUI) CFLAGSSLO+=$(CFLAGSSLOCUIMT) CDEFSSLO+=$(CDEFSSLOMT) LINKFLAGSAPP=$(LINKFLAGSAPPCUI) |