diff options
| author | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2011-03-22 11:11:01 +0100 |
|---|---|---|
| committer | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2011-03-22 11:11:01 +0100 |
| commit | ca94c1bc1148a170bb33722657d5432a0fd70553 (patch) | |
| tree | 59f5d8e9f0fe1a76eaa287bdea8c29eb3fede544 | |
| parent | 8cbadd8956403b0b0018592f78bf826cd76427c1 (diff) | |
Trying to remove NODEFAULTLIB on Windows
| -rw-r--r-- | odk/settings/settings.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/odk/settings/settings.mk b/odk/settings/settings.mk index 15b8af9c..0609353c 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 |