diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2011-03-23 17:13:49 +0100 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2011-03-23 17:13:49 +0100 |
| commit | e04680dd0e41342e7bf613b1d50559825f1dd014 (patch) | |
| tree | b0acf959de23248a0e3407cd1db3da1823dc2673 | |
| parent | d9bfe2b1782c2d0139553b592464061ae05af35d (diff) | |
| parent | ca94c1bc1148a170bb33722657d5432a0fd70553 (diff) | |
Merge branch 'master' of git://anongit.freedesktop.org/libreoffice/sdk
| -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 6dad32e8..e4fc05ad 100644 --- a/odk/settings/settings.mk +++ b/odk/settings/settings.mk @@ -100,9 +100,9 @@ CC_DEFINES_JNI=-DWIN32 -DWNT -D_DLL -DCPPU_ENV=msci 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 @@ -116,7 +116,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 |