summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVladimir Glazounov <vg@openoffice.org>2007-10-15 11:42:27 +0000
committerVladimir Glazounov <vg@openoffice.org>2007-10-15 11:42:27 +0000
commit77b4ee9bcda32b0e3941b9c2977006d039bac157 (patch)
treeb2774190deb9cd44f5db396e6e868a5d5781ca1a
parentc8fc2b851f75c44384d860959a4ccb71361feb0a (diff)
INTEGRATION: CWS sb71 (1.31.8); FILE MERGED
2007/10/09 08:18:17 sb 1.31.8.9: Fix for cygwin environment. 2007/10/02 09:48:02 sb 1.31.8.8: RESYNC: (1.32-1.33); FILE MERGED 2007/08/23 17:51:13 sb 1.31.8.7: RESYNC: (1.31-1.32); FILE MERGED 2007/08/13 14:16:26 sb 1.31.8.6: #i77184# Dropped /DELAYLOAD for STLport and libxml2 again---too much trouble. 2007/08/13 13:04:44 sb 1.31.8.5: #i77184# Dropped NO_WINDOWS_DELAYLOAD again (probably not needed at the moment after all). 2007/07/25 12:01:12 sb 1.31.8.4: #i77184# Drop MSVCRTLIB again and use already existing LIBCMT instead (which for wntmsci10 and wntmsci11 at least correctly differentiates between using msvcrt.lib and msvcrtd.lib; this probably needs to be added for wntgcci6, too). 2007/07/12 16:17:18 hro 1.31.8.3: #i77184# Use _pRawDllMain entry point for current module file name detection 2007/07/09 13:33:54 hro 1.31.8.2: #77184# Use delayload.obj from local output tree in SAL 2007/07/09 09:16:23 hro 1.31.8.1: #77184# Use /DELAYLOAD for URE libs
-rw-r--r--solenv/inc/wntmsci10.mk16
1 files changed, 8 insertions, 8 deletions
diff --git a/solenv/inc/wntmsci10.mk b/solenv/inc/wntmsci10.mk
index 4669bccf8e35..2ed2002075e5 100644
--- a/solenv/inc/wntmsci10.mk
+++ b/solenv/inc/wntmsci10.mk
@@ -4,9 +4,9 @@
#
# $RCSfile: wntmsci10.mk,v $
#
-# $Revision: 1.33 $
+# $Revision: 1.34 $
#
-# last change: $Author: hr $ $Date: 2007-09-27 07:49:54 $
+# last change: $Author: vg $ $Date: 2007-10-15 12:42:27 $
#
# The Contents of this file are made available subject to
# the terms of GNU Lesser General Public License Version 2.1.
@@ -266,7 +266,8 @@ LINKFLAGSWST=-DEBUG:mapped,partial -DEBUGTYPE:coff wst.lib -NODEFAULTLIB
LINKFLAGSDEBUG=-DEBUG:full -DEBUGTYPE:cv
LINKFLAGSOPT=
-UWINAPILIB*=uwinapi.lib
+DELAYLOADOBJ*=$(L)$/delayload.obj $(L)$/delayloadinit.obj
+UWINAPILIB*=uwinapi.lib -DELAYLOAD:uwinapi.dll
.IF "$(DYNAMIC_CRT)"!=""
.IF "$(USE_STLP_DEBUG)" != ""
LIBCMT=msvcrtd.lib
@@ -287,10 +288,10 @@ STDSLOGUI=
STDOBJCUI=
STDSLOCUI=
-STDLIBGUIMT=$(LIBCMT) $(UWINAPILIB) kernel32.lib user32.lib oldnames.lib
-STDLIBCUIMT=$(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
+STDLIBGUIMT=$(LIBCMT) $(DELAYLOADOBJ) delayimp.lib $(UWINAPILIB) kernel32.lib user32.lib oldnames.lib psapi.lib
+STDLIBCUIMT=$(LIBCMT) $(DELAYLOADOBJ) delayimp.lib $(UWINAPILIB) kernel32.lib user32.lib oldnames.lib psapi.lib
+STDSHLGUIMT=$(LIBCMT) $(DELAYLOADOBJ) delayimp.lib $(UWINAPILIB) kernel32.lib user32.lib oldnames.lib psapi.lib
+STDSHLCUIMT=$(LIBCMT) $(DELAYLOADOBJ) delayimp.lib $(UWINAPILIB) kernel32.lib user32.lib oldnames.lib psapi.lib
.IF "$(USE_STLP_DEBUG)" != ""
CFLAGS+=-MTd
@@ -341,7 +342,6 @@ MPRLIB=mpr.lib
WS2_32LIB=ws2_32.lib
KERNEL32LIB=kernel32.lib
USER32LIB=user32.lib
-MSVCRTLIB=msvcrt.lib
COMDLG32LIB=comdlg32.lib
COMCTL32LIB=comctl32.lib
CRYPT32LIB=crypt32.lib