[Libreoffice-commits] .: odk/settings

[Fridrich Strba]

 odk/settings/settings.mk |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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

    Trying to remove NODEFAULTLIB on Windows

diff --git a/odk/settings/settings.mk b/odk/settings/settings.mk
index 15b8af9..0609353 100644
--- a/odk/settings/settings.mk
+++ b/odk/settings/settings.mk
@@ -97,9 +97,9 @@ SDK_JAVA_INCLUDES = -I"$(OO_SDK_JAVA_HOME)/include" -I"$(OO_SDK_JAVA_HOME)/inclu
 CC_DEFINES=-DWIN32 -DWNT -D_DLL -DCPPU_ENV=msci
 CC_OUTPUT_SWITCH=-Fo
 
-LIBRARY_LINK_FLAGS=/NODEFAULTLIB /DLL /DEBUGTYPE:cv
+LIBRARY_LINK_FLAGS=/MD /DLL /DEBUGTYPE:cv
 COMP_LINK_FLAGS=$(LIBRARY_LINK_FLAGS) /DEF:$(PRJ)/settings/component.uno.def
-EXE_LINK_FLAGS=/MAP /OPT:NOREF /SUBSYSTEM:CONSOLE /BASE:0x1b000000 /DEBUGTYPE:cv /NODEFAULTLIB  msvcrt.lib kernel32.lib
+EXE_LINK_FLAGS=/MAP /OPT:NOREF /SUBSYSTEM:CONSOLE /BASE:0x1b000000 /DEBUGTYPE:cv /MD  msvcrt.lib kernel32.lib
 ifeq "$(DEBUG)" "yes"
 LIBRARY_LINK_FLAGS+=/DEBUG
 EXE_LINK_FLAGS+=/DEBUG
@@ -113,7 +113,7 @@ endif
 
 # use this for release version
 #EXE_LINK_FLAGS=/MAP /OPT:NOREF /SUBSYSTEM:CONSOLE /BASE:0x1100000
-#LIBRARY_LINK_FLAGS=/NODEFAULTLIB /DLL
+#LIBRARY_LINK_FLAGS=/MD /DLL
 endif