diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2007-06-05 09:55:30 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2007-06-05 09:55:30 +0000 |
| commit | 844ce7e50d2955303ca620ecdc337acbbf992366 (patch) | |
| tree | d5a08e222b2b52907d96b68e507f0c015516f518 /extensions | |
| parent | 7284f508a1858f34a1cc46039fa46e61f2f4ad6e (diff) | |
INTEGRATION: CWS obo12 (1.22.32); FILE MERGED
2007/06/05 09:47:39 obo 1.22.32.5: overview 2. target
2007/06/01 09:50:58 obo 1.22.32.4: don't use COMEX
2007/06/01 09:38:51 obo 1.22.32.3: bugfix
2007/05/29 08:18:01 obo 1.22.32.2: remove COMEX
2007/05/24 15:28:55 obo 1.22.32.1: #i76713# DISABLE_ATL
Diffstat (limited to 'extensions')
| -rw-r--r-- | extensions/source/ole/makefile.mk | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/extensions/source/ole/makefile.mk b/extensions/source/ole/makefile.mk index 2496a020f3ab..2acacbcc0b40 100644 --- a/extensions/source/ole/makefile.mk +++ b/extensions/source/ole/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.23 $ +# $Revision: 1.24 $ # -# last change: $Author: vg $ $Date: 2007-05-25 10:49:50 $ +# last change: $Author: ihi $ $Date: 2007-06-05 10:55:30 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -53,7 +53,7 @@ INCPRE+= -I$(ATL_INCLUDE) # --- Settings ----------------------------------------------------- -.IF "$(GUI)"=="WNT" +.IF "$(GUI)" == "WNT" && "$(DISABLE_ATL)"=="" SLOFILES= \ $(SLO)$/servreg.obj \ @@ -83,13 +83,15 @@ SHL1STDLIBS=\ $(ADVAPI32LIB) \ $(OLEAUT32LIB) -.IF "$(COMEX)"=="8" || "$(COMEX)"=="10" +.IF "$(COM)"=="MSC" +.IF "$(WINDOWS_VISTA_PSDK)"!="" || "$(CCNUMVER)"<="001399999999" .IF "$(USE_STLP_DEBUG)" != "" SHL1STDLIBS+= $(ATL_LIB)$/atlsd.lib .ELSE SHL1STDLIBS+= $(ATL_LIB)$/atls.lib .ENDIF -.ENDIF +.ENDIF # "$(WINDOWS_VISTA_PSDK)"!="" || "$(CCNUMVER)"<="001399999999" +.ENDIF # "$(COM)"=="MSC" SHL1LIBS= SHL1OBJS=$(SLOFILES) @@ -109,13 +111,15 @@ SHL2STDLIBS=\ $(ADVAPI32LIB) \ $(OLEAUT32LIB) -.IF "$(COMEX)"=="8" || "$(COMEX)"=="10" +.IF "$(COM)"=="MSC" +.IF "$(WINDOWS_VISTA_PSDK)"!="" || "$(CCNUMVER)"<="001399999999" .IF "$(USE_STLP_DEBUG)" != "" SHL2STDLIBS+= $(ATL_LIB)$/atlsd.lib .ELSE SHL2STDLIBS+= $(ATL_LIB)$/atls.lib .ENDIF -.ENDIF +.ENDIF # "$(WINDOWS_VISTA_PSDK)"!="" || "$(CCNUMVER)"<="001399999999" +.ENDIF # "$(COM)"=="MSC" SHL2LIBS= SHL2OBJS=$(REAL_OWNGUID_SLOFILES) @@ -128,3 +132,4 @@ DEF2EXPORTFILE=$(TARGET).dxp #---------------------------------------------------------------- .INCLUDE : target.mk + |