diff options
| author | Oliver Bolte <obo@openoffice.org> | 2006-01-20 11:59:58 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2006-01-20 11:59:58 +0000 |
| commit | 2c3b8575a81f85614a67437fe10ae3a0130d5c33 (patch) | |
| tree | 62d73188ba4472875b9766b58a08861010fc9748 | |
| parent | d2a32f308ce25ed29fdd71cead9efced3325701c (diff) | |
INTEGRATION: CWS vcl49 (1.4.60); FILE MERGED
2005/12/14 15:44:30 pl 1.4.60.1: #i56878# use mozilla headers instead of npsdk, use OJI definition
| -rw-r--r-- | extensions/source/plugin/win/makefile.mk | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/extensions/source/plugin/win/makefile.mk b/extensions/source/plugin/win/makefile.mk index c6cb2e28cfee..d6a31082da0c 100644 --- a/extensions/source/plugin/win/makefile.mk +++ b/extensions/source/plugin/win/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.4 $ +# $Revision: 1.5 $ # -# last change: $Author: rt $ $Date: 2005-09-08 19:58:00 $ +# last change: $Author: obo $ $Date: 2006-01-20 12:59:58 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -44,6 +44,13 @@ ENABLE_EXCEPTIONS=TRUE .INCLUDE : ..$/util$/makefile.pmk +INCPRE+=-I$(SOLARINCDIR)$/mozilla$/plugin +.IF "$(SOLAR_JAVA)" != "" +INCPRE+=-I$(SOLARINCDIR)$/mozilla$/java +INCPRE+=-I$(SOLARINCDIR)$/mozilla$/nspr +CDEFS+=-DOJI +.ENDIF + # --- Types ------------------------------------- #UNOUCROUT=$(OUT)$/inc$/$(PRJNAME) |