diff options
| author | Oliver Bolte <obo@openoffice.org> | 2007-03-09 08:13:36 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2007-03-09 08:13:36 +0000 |
| commit | b7ee8d49dc003c7d75900ed247b93e83cd7f93fb (patch) | |
| tree | 454196540ace4168ba12bfa90dd873b4f2dc5b02 /solenv/inc/wntmsci11.mk | |
| parent | 47ec3f311e61c1ea4126e2bd9339825dd9331ccc (diff) | |
INTEGRATION: CWS ause076 (1.3.90); FILE MERGED
2007/03/01 16:50:04 hjs 1.3.90.2: #i75028# kick obsolete settings
2007/02/22 17:39:06 hjs 1.3.90.1: #i74721# cleanup obsolete library variables
Diffstat (limited to 'solenv/inc/wntmsci11.mk')
| -rw-r--r-- | solenv/inc/wntmsci11.mk | 23 |
1 files changed, 6 insertions, 17 deletions
diff --git a/solenv/inc/wntmsci11.mk b/solenv/inc/wntmsci11.mk index 753294eb9..7cd63db3c 100644 --- a/solenv/inc/wntmsci11.mk +++ b/solenv/inc/wntmsci11.mk @@ -4,9 +4,9 @@ # # $RCSfile: wntmsci11.mk,v $ # -# $Revision: 1.5 $ +# $Revision: 1.6 $ # -# last change: $Author: obo $ $Date: 2007-03-05 13:50:56 $ +# last change: $Author: obo $ $Date: 2007-03-09 09:13:36 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -128,21 +128,15 @@ CFLAGSCC=$(ARCH_FLAGS) CDEFSSLOMT+=-DWIN32 -D_MT -D_DLL CDEFSSLOMT+=-DWIN32 -D_MT -D_DLL .IF "$(NO_DYNAMIC_OBJ)"=="" -CDEFSOBJST+=-DWIN32 -D_DLL -CDEFSOBJST+=-DWIN32 -D_DLL CDEFSOBJMT+=-DWIN32 -D_MT -D_DLL CDEFSOBJMT+=-DWIN32 -D_MT -D_DLL .ELSE -CDEFSOBJST+=-DWIN32 -CDEFSOBJST+=-DWIN32 CDEFSOBJMT+=-DWIN32 -D_MT CDEFSOBJMT+=-DWIN32 -D_MT .ENDIF .ELSE CDEFSSLOMT+=-DWIN32 -D_MT CDEFSSLOMT+=-DWIN32 -D_MT -CDEFSOBJST+=-DWIN32 -CDEFSOBJST+=-DWIN32 CDEFSOBJMT+=-DWIN32 -D_MT CDEFSOBJMT+=-DWIN32 -D_MT .ENDIF @@ -321,18 +315,17 @@ LINKFLAGSOPT= UWINAPILIB*=uwinapi.lib .IF "$(DYNAMIC_CRT)"!="" -LIBCST=msvcrt.lib .IF "$(USE_STLP_DEBUG)" != "" LIBCMT=msvcrtd.lib .ELSE # "$(USE_STLP_DEBUG)" != "" LIBCMT=msvcrt.lib .ENDIF # "$(USE_STLP_DEBUG)" != "" -# See iz57443 for details about LIBCIMT -#LIBCIMT= .ELSE -LIBCST=libc.lib +.IF "$(USE_STLP_DEBUG)" != "" +LIBCMT=libcmtd.lib +.ELSE # "$(USE_STLP_DEBUG)" != "" LIBCMT=libcmt.lib -LIBCIMT=libcimt.lib +.ENDIF # "$(USE_STLP_DEBUG)" != "" .ENDIF STDOBJVCL=$(L)$/salmain.obj @@ -341,12 +334,8 @@ STDSLOGUI= STDOBJCUI= STDSLOCUI= -STDLIBGUIST=$(LIBCST) $(UWINAPILIB) kernel32.lib user32.lib oldnames.lib -STDLIBCUIST=$(LIBCST) $(UWINAPILIB) kernel32.lib user32.lib oldnames.lib STDLIBGUIMT=$(LIBCMT) $(UWINAPILIB) kernel32.lib user32.lib oldnames.lib STDLIBCUIMT=$(LIBCMT) $(UWINAPILIB) kernel32.lib user32.lib oldnames.lib -STDSHLGUIST=$(LIBCMT) $(UWINAPILIB) kernel32.lib user32.lib oldnames.lib -STDSHLCUIST=$(LIBCMT) $(UWINAPILIB) kernel32.lib user32.lib oldnames.lib STDSHLGUIMT=$(LIBCMT) $(UWINAPILIB) kernel32.lib user32.lib oldnames.lib STDSHLCUIMT=$(LIBCMT) $(UWINAPILIB) kernel32.lib user32.lib oldnames.lib |