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

[Fridrich Strba]

 solenv/bin/guw.pl        |    2 -
 solenv/inc/set_wntx64.mk |    4 +--
 solenv/inc/wntmsc.mk     |   54 +++++++++++++++++++++++++++++++++++++----------
 3 files changed, 46 insertions(+), 14 deletions(-)

New commits:
commit ec64e50147a1df39a841c9eb64e26f976d856377
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Tue Mar 22 15:40:08 2011 +0100

    Reverting what should be reverted and leaving what should be left

diff --git a/solenv/bin/guw.pl b/solenv/bin/guw.pl
index ce53cfb..e263e46 100755
--- a/solenv/bin/guw.pl
+++ b/solenv/bin/guw.pl
@@ -47,7 +47,7 @@ use Text::ParseWords;
                'csc', [ '-target:' ],
                'lib', [ 'OUT:', 'EXTRACT:','out:', 'def:', 'machine:' ],
                'link', [ 'BASE:', 'DEBUG', 'DLL', 'LIBPATH', 'MACHINE:',
-                         'MAP', 'MD', 'OPT', 'PDB', 'RELEASE',
+                         'MAP', 'NODEFAULTLIB', 'OPT', 'PDB', 'RELEASE',
                          'SUBSYSTEM', 'STACK', 'out:', 'map:', 'ENTRY:',
                          'implib:', 'delayload:', 'def', 'COMMENT:' ],
                'regcomp', [ '-env:', 'vnd.sun.star.expand:' , 'vnd.openoffice.pymodule' ],
diff --git a/solenv/inc/set_wntx64.mk b/solenv/inc/set_wntx64.mk
index a132d52..e14c94d 100755
--- a/solenv/inc/set_wntx64.mk
+++ b/solenv/inc/set_wntx64.mk
@@ -92,9 +92,9 @@ LINKFLAGS+=-nxcompat
 LINKFLAGS+=-dynamicbase
 
 .IF "$(PRODUCT)"!="full"
-LINKFLAGS_X64+= -MD -DEBUG
+LINKFLAGS_X64+= -NODEFAULTLIB -DEBUG
 .ELSE # "$(PRODUCT)"!="full"
-LINKFLAGS_X64+= -MD -RELEASE -DEBUG -INCREMENTAL:NO
+LINKFLAGS_X64+= -NODEFAULTLIB -RELEASE -DEBUG -INCREMENTAL:NO
 .ENDIF # "$(PRODUCT)"!="full"
 MAPFILE=-out:$$@
 
diff --git a/solenv/inc/wntmsc.mk b/solenv/inc/wntmsc.mk
index 0e4925f..1276f77 100755
--- a/solenv/inc/wntmsc.mk
+++ b/solenv/inc/wntmsc.mk
@@ -83,7 +83,7 @@ COMPILE_ECHO_FILE=
 # disable "warning C4675: resolved overload was found by argument-dependent
 # lookup":
 # -wd4251 -wd4275 -wd4290 -wd4675 -wd4786 -wd4800
-CFLAGS+=-Zm500 -Zc:forScope,wchar_t- -GR -MD
+CFLAGS+=-Zm500 -Zc:forScope,wchar_t- -GR
 
 # Stack buffer overrun detection.
 CFLAGS+=-GS
@@ -146,8 +146,22 @@ 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)"!=""
 
 CFLAGSPROF=-Gh -Fd$(MISC)/$(@:b).pdb
 CFLAGSDEBUG=-Zi -Fd$(MISC)/$(@:b).pdb
@@ -241,27 +255,27 @@ LINKFLAGS+=-nxcompat
 LINKFLAGS+=-dynamicbase
 
 .IF "$(linkinc)" != ""
-LINKFLAGS+=-DLL -INCREMENTAL:YES -DEBUG
+LINKFLAGS+=-NODEFAULTLIB -INCREMENTAL:YES -DEBUG
 MAPFILE=
 _VC_MANIFEST_INC=1
 .ELSE # "$(linkinc)" != ""
 _VC_MANIFEST_INC=0
 .IF "$(PRODUCT)"!="full"
-LINKFLAGS+= -DLL -DEBUG
+LINKFLAGS+= -NODEFAULTLIB -DEBUG
 .ELSE # "$(PRODUCT)"!="full"
-LINKFLAGS+= -DLL -RELEASE -DEBUG -INCREMENTAL:NO
+LINKFLAGS+= -NODEFAULTLIB -RELEASE -DEBUG -INCREMENTAL:NO
 .ENDIF # "$(PRODUCT)"!="full"
 MAPFILE=-out:$$@
 .ENDIF # "$(linkinc)" != ""
 
 .IF "$(bndchk)" != ""
 LINK=nmlink $(COMMENTFLAG) $(NOLOGO) /MACHINE:IX86
-LINKFLAGS=-DLL -DEBUG
+LINKFLAGS=-NODEFAULTLIB -DEBUG
 .ENDIF
 
 .IF "$(truetime)" != ""
 LINK=nmlink /NMttOn $(COMMENTFLAG) $(NOLOGO) /MACHINE:IX86
-LINKFLAGS=-DLL -DEBUG
+LINKFLAGS=-NODEFAULTLIB -DEBUG
 .ENDIF
 
 .IF "$(COMEX)" == "11"
@@ -275,11 +289,29 @@ LINKFLAGSAPPCUI=/SUBSYSTEM:CONSOLE /BASE:0x1b000000
 LINKFLAGSSHLCUI=/SUBSYSTEM:CONSOLE /DLL
 LINKFLAGSTACK=/STACK:
 LINKFLAGSPROF=/DEBUG:mapped,partial /DEBUGTYPE:coff cap.lib
-LINKFLAGSWST=/DEBUG:mapped,partial /DEBUGTYPE:coff wst.lib /DLL
+LINKFLAGSWST=/DEBUG:mapped,partial /DEBUGTYPE:coff wst.lib /NODEFAULTLIB
 LINKFLAGSDEBUG=-DEBUG
 LINKFLAGSOPT=
 
 UWINAPILIB*=uwinapi.lib
+.IF "$(DYNAMIC_CRT)"!=""
+.IF "$(USE_DEBUG_RUNTIME)" != ""
+LIBCMT=msvcrtd.lib
+LIBCPMT=msvcprtd.lib
+.ELSE  # "$(USE_DEBUG_RUNTIME)" != ""
+LIBCMT=msvcrt.lib
+LIBCPMT=msvcprt.lib
+.ENDIF # "$(USE_DEBUG_RUNTIME)" != ""
+.ELSE # "$(DYNAMIC_CRT)"!=""
+.IF "$(USE_DEBUG_RUNTIME)" != ""
+LIBCMT=libcmtd.lib
+LIBCPMT=libcpmtd.lib
+CDEFS+=-D_DEBUG
+.ELSE  # "$(USE_DEBUG_RUNTIME)" != ""
+LIBCMT=libcmt.lib
+LIBCPMT=libcpmt.lib
+.ENDIF # "$(USE_DEBUG_RUNTIME)" != ""
+.ENDIF # "$(DYNAMIC_CRT)"!=""
 
 STDOBJVCL=$(L)/salmain.obj
 STDOBJGUI=
@@ -287,10 +319,10 @@ STDSLOGUI=
 STDOBJCUI=
 STDSLOCUI=
 
-STDLIBGUIMT=$(UWINAPILIB)
-STDLIBCUIMT=$(UWINAPILIB)
-STDSHLGUIMT=$(UWINAPILIB)
-STDSHLCUIMT=$(UWINAPILIB)
+STDLIBGUIMT=$(LIBCMT) $(LIBCPMT) $(UWINAPILIB) kernel32.lib user32.lib oldnames.lib
+STDLIBCUIMT=$(LIBCMT) $(LIBCPMT) $(UWINAPILIB) kernel32.lib user32.lib oldnames.lib
+STDSHLGUIMT=$(LIBCMT) $(LIBCPMT) $(UWINAPILIB) kernel32.lib user32.lib oldnames.lib
+STDSHLCUIMT=$(LIBCMT) $(LIBCPMT) $(UWINAPILIB) kernel32.lib user32.lib oldnames.lib
 
 LIBMGR=lib $(NOLOGO)
 IMPLIB=lib