diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2008-02-04 11:58:26 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2008-02-04 11:58:26 +0000 |
| commit | fe90040d60d7db3b24086c5a62b63b1f8c56e55e (patch) | |
| tree | 0775d900724549b45a08565766e2924742eedb5c | |
| parent | c99dd1c132821da9a124eff200f688e4d56d6408 (diff) | |
INTEGRATION: CWS mingwport10 (1.20.2); FILE MERGED
2008/01/28 15:32:54 vg 1.20.2.1: #i85437# catch-up fixes for m243
| -rw-r--r-- | extensions/source/activex/main/makefile.mk | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/extensions/source/activex/main/makefile.mk b/extensions/source/activex/main/makefile.mk index a98392ca1..fee208396 100644 --- a/extensions/source/activex/main/makefile.mk +++ b/extensions/source/activex/main/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.20 $ +# $Revision: 1.21 $ # -# last change: $Author: ihi $ $Date: 2008-01-15 13:27:16 $ +# last change: $Author: ihi $ $Date: 2008-02-04 12:58:26 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -52,7 +52,7 @@ VERSIONOBJ= LIBTARGET=NO USE_DEFFILE=YES -INCPRE+=$(ATL_INCLUDE) \ +INCPRE+=$(foreach,i,$(ATL_INCLUDE) -I$(i)) \ -I$(MISC) \ # --- Files ------------------------------------- @@ -87,6 +87,7 @@ SHL1STDLIBS=\ $(URLMONLIB) \ $(SHLWAPILIB) +.IF "$(COM)"!="GCC" .IF "$(CCNUMVER)" > "001300000000" .IF "$(USE_STLP_DEBUG)" != "" SHL1STDLIBS+= $(ATL_LIB)$/atlsd.lib @@ -94,6 +95,7 @@ SHL1STDLIBS=\ SHL1STDLIBS+= $(ATL_LIB)$/atls.lib .ENDIF .ENDIF +.ENDIF # $(KERNEL32LIB) \ |