[Libreoffice-commits] .: 3 commits - solenv/inc

[Tor Lillqvist]

 solenv/inc/settings.mk |    6 +++++-
 solenv/inc/wntmsc.mk   |   15 +++++----------
 2 files changed, 10 insertions(+), 11 deletions(-)

New commits:
commit ef2b6b2b8cfc6fcedce424bd4573a8856aee008a
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Mon Aug 15 16:44:57 2011 +0300

    Cosmetics: Avoid repetition, -D_MT is in CDEFS

diff --git a/solenv/inc/wntmsc.mk b/solenv/inc/wntmsc.mk
index 7fa6ef3..3d01d29 100644
--- a/solenv/inc/wntmsc.mk
+++ b/solenv/inc/wntmsc.mk
@@ -141,15 +141,15 @@ CFLAGSCALL=-Gz
 
 CFLAGSCC=$(ARCH_FLAGS)
 .IF "$(DYNAMIC_CRT)"!=""
-CDEFSSLOMT+=-DWIN32 -D_MT -D_DLL
+CDEFSSLOMT+=-DWIN32 -D_DLL
 .IF "$(NO_DYNAMIC_OBJ)"==""
-CDEFSOBJMT+=-DWIN32 -D_MT -D_DLL
+CDEFSOBJMT+=-DWIN32 -D_DLL
 .ELSE
-CDEFSOBJMT+=-DWIN32 -D_MT
+CDEFSOBJMT+=-DWIN32
 .ENDIF # "$(NO_DYNAMIC_OBJ)"==""
 .ELSE
-CDEFSSLOMT+=-DWIN32 -D_MT
-CDEFSOBJMT+=-DWIN32 -D_MT
+CDEFSSLOMT+=-DWIN32
+CDEFSOBJMT+=-DWIN32
 .ENDIF # "$(DYNAMIC_CRT)"!=""
 
 CFLAGSPROF=-Gh -Fd$(MISC)/$(@:b).pdb
commit c1c99bf42c5fd6f5cfa4247115408246bda36f1b
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Mon Aug 15 16:36:15 2011 +0300

    Cosmetics: Don't bother with -D$(GUI) if $(GUI)==$(OS) anyway

diff --git a/solenv/inc/settings.mk b/solenv/inc/settings.mk
index 352b850..f395fa1 100644
--- a/solenv/inc/settings.mk
+++ b/solenv/inc/settings.mk
@@ -870,7 +870,11 @@ UNOIDLDEPFLAGS=-Mdepend=$(SOLARVER)
 
 UNOIDLINC+=-I. -I.. -I$(PRJ) -I$(PRJ)/inc -I$(PRJ)/$(INPATH)/idl -I$(OUT)/inc -I$(SOLARIDLDIR) -I$(SOLARINCDIR)
 
-CDEFS= -D$(OS) -D$(GUI) -D$(GVER) -D$(COM) -D$(CPUNAME)
+CDEFS=-D$(OS)
+.IF "$(GUI)" != "$(OS)"
+CDEFS+=-D$(GUI)
+.ENDIF
+CDEFS+=-D$(GVER) -D$(COM) -D$(CPUNAME)
 
 .IF "$(USE_DEBUG_RUNTIME)" != ""
 CDEFS+=-D_DEBUG_RUNTIME
commit a92241263e4b11cfc9b341531fa656a38671c889
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Mon Aug 15 16:26:52 2011 +0300

    Bin duplicated lines

diff --git a/solenv/inc/wntmsc.mk b/solenv/inc/wntmsc.mk
index 9aca574..7fa6ef3 100644
--- a/solenv/inc/wntmsc.mk
+++ b/solenv/inc/wntmsc.mk
@@ -142,18 +142,13 @@ CFLAGSCALL=-Gz
 CFLAGSCC=$(ARCH_FLAGS)
 .IF "$(DYNAMIC_CRT)"!=""
 CDEFSSLOMT+=-DWIN32 -D_MT -D_DLL
-CDEFSSLOMT+=-DWIN32 -D_MT -D_DLL
 .IF "$(NO_DYNAMIC_OBJ)"==""
 CDEFSOBJMT+=-DWIN32 -D_MT -D_DLL
-CDEFSOBJMT+=-DWIN32 -D_MT -D_DLL
 .ELSE
 CDEFSOBJMT+=-DWIN32 -D_MT
-CDEFSOBJMT+=-DWIN32 -D_MT
 .ENDIF # "$(NO_DYNAMIC_OBJ)"==""
 .ELSE
 CDEFSSLOMT+=-DWIN32 -D_MT
-CDEFSSLOMT+=-DWIN32 -D_MT
-CDEFSOBJMT+=-DWIN32 -D_MT
 CDEFSOBJMT+=-DWIN32 -D_MT
 .ENDIF # "$(DYNAMIC_CRT)"!=""