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

[Fridrich Strba]

 solenv/bin/guw.pl                 |    2 +-
 solenv/gbuild/platform/windows.mk |    6 +-----
 solenv/inc/set_wntx64.mk          |    4 ++--
 solenv/inc/wntmsc.mk              |   12 ++++++------
 4 files changed, 10 insertions(+), 14 deletions(-)

New commits:
commit 559b710c291678ee58fa6c114966eb42091c87bc
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Tue Mar 22 11:11:00 2011 +0100

    Trying to remove NODEFAULTLIB on Windows

diff --git a/solenv/bin/guw.pl b/solenv/bin/guw.pl
index e263e46..ce53cfb 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', 'NODEFAULTLIB', 'OPT', 'PDB', 'RELEASE',
+                         'MAP', 'MD', '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/gbuild/platform/windows.mk b/solenv/gbuild/platform/windows.mk
index 07a7dc9..90d33d0 100755
--- a/solenv/gbuild/platform/windows.mk
+++ b/solenv/gbuild/platform/windows.mk
@@ -162,10 +162,6 @@ gb_CXXFLAGS := \
 
 gb_STDLIBS := \
 	uwinapi \
-	kernel32 \
-	msvcrt \
-	msvcprt \
-	oldnames \
 
 ifneq ($(EXTERNAL_WARNINGS_NOT_ERRORS),TRUE)
 gb_CFLAGS_WERROR := -WX
@@ -186,7 +182,7 @@ gb_NoexPrecompiledHeader_NOEXCEPTIONFLAGS := $(gb_LinkTarget_NOEXCEPTIONFLAGS)
 
 gb_LinkTarget_LDFLAGS := \
 	-MACHINE:IX86 \
-	-NODEFAULTLIB \
+	-MD \
 	-OPT:NOREF \
 	-SUBSYSTEM:CONSOLE \
 	-safeseh \
diff --git a/solenv/inc/set_wntx64.mk b/solenv/inc/set_wntx64.mk
index e14c94d..a132d52 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+= -NODEFAULTLIB -DEBUG
+LINKFLAGS_X64+= -MD -DEBUG
 .ELSE # "$(PRODUCT)"!="full"
-LINKFLAGS_X64+= -NODEFAULTLIB -RELEASE -DEBUG -INCREMENTAL:NO
+LINKFLAGS_X64+= -MD -RELEASE -DEBUG -INCREMENTAL:NO
 .ENDIF # "$(PRODUCT)"!="full"
 MAPFILE=-out:$$@
 
diff --git a/solenv/inc/wntmsc.mk b/solenv/inc/wntmsc.mk
index 1276f77..70c0e27 100755
--- a/solenv/inc/wntmsc.mk
+++ b/solenv/inc/wntmsc.mk
@@ -255,27 +255,27 @@ LINKFLAGS+=-nxcompat
 LINKFLAGS+=-dynamicbase
 
 .IF "$(linkinc)" != ""
-LINKFLAGS+=-NODEFAULTLIB -INCREMENTAL:YES -DEBUG
+LINKFLAGS+=-MD -INCREMENTAL:YES -DEBUG
 MAPFILE=
 _VC_MANIFEST_INC=1
 .ELSE # "$(linkinc)" != ""
 _VC_MANIFEST_INC=0
 .IF "$(PRODUCT)"!="full"
-LINKFLAGS+= -NODEFAULTLIB -DEBUG
+LINKFLAGS+= -MD -DEBUG
 .ELSE # "$(PRODUCT)"!="full"
-LINKFLAGS+= -NODEFAULTLIB -RELEASE -DEBUG -INCREMENTAL:NO
+LINKFLAGS+= -MD -RELEASE -DEBUG -INCREMENTAL:NO
 .ENDIF # "$(PRODUCT)"!="full"
 MAPFILE=-out:$$@
 .ENDIF # "$(linkinc)" != ""
 
 .IF "$(bndchk)" != ""
 LINK=nmlink $(COMMENTFLAG) $(NOLOGO) /MACHINE:IX86
-LINKFLAGS=-NODEFAULTLIB -DEBUG
+LINKFLAGS=-MD -DEBUG
 .ENDIF
 
 .IF "$(truetime)" != ""
 LINK=nmlink /NMttOn $(COMMENTFLAG) $(NOLOGO) /MACHINE:IX86
-LINKFLAGS=-NODEFAULTLIB -DEBUG
+LINKFLAGS=-MD -DEBUG
 .ENDIF
 
 .IF "$(COMEX)" == "11"
@@ -289,7 +289,7 @@ 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 /NODEFAULTLIB
+LINKFLAGSWST=/DEBUG:mapped,partial /DEBUGTYPE:coff wst.lib /MD
 LINKFLAGSDEBUG=-DEBUG
 LINKFLAGSOPT=