[Libreoffice-commits] .: solenv/inc

Fridrich Strba fridrich at kemper.freedesktop.org
Tue Mar 22 06:16:51 PDT 2011


 solenv/inc/wntmsc.mk |   18 ++----------------
 1 file changed, 2 insertions(+), 16 deletions(-)

New commits:
commit bce7488354967cd3a2232c6fda33575849557ac4
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Tue Mar 22 14:16:42 2011 +0100

    And yet one another windows build environment tweak

diff --git a/solenv/inc/wntmsc.mk b/solenv/inc/wntmsc.mk
index 0e1b210..79a44a7 100755
--- a/solenv/inc/wntmsc.mk
+++ b/solenv/inc/wntmsc.mk
@@ -146,22 +146,8 @@ CFLAGSCALL=-Gz
 .ENDIF			# "$(CALL_CDECL)"=="TRUE"
 
 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)"!=""
+CDEFSSLOMT+=-DWIN32
+CDEFSOBJMT+=-DWIN32
 
 CFLAGSPROF=-Gh -Fd$(MISC)/$(@:b).pdb
 CFLAGSDEBUG=-Zi -Fd$(MISC)/$(@:b).pdb


More information about the Libreoffice-commits mailing list