diff options
author | Oliver Bolte <obo@openoffice.org> | 2006-01-20 11:58:03 +0000 |
---|---|---|
committer | Oliver Bolte <obo@openoffice.org> | 2006-01-20 11:58:03 +0000 |
commit | a53058d96521cade7ec2a15bddaff409745a8c98 (patch) | |
tree | 47fe2bc475d19ac5ed474c1f64b17e0511be7944 /extensions/source/plugin/base/makefile.mk | |
parent | b71f6f5b9e459f5172f0155a05be0bb76add4a08 (diff) |
INTEGRATION: CWS vcl49 (1.8.60); FILE MERGED
2005/12/14 15:44:28 pl 1.8.60.1: #i56878# use mozilla headers instead of npsdk, use OJI definition
Diffstat (limited to 'extensions/source/plugin/base/makefile.mk')
-rw-r--r-- | extensions/source/plugin/base/makefile.mk | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/extensions/source/plugin/base/makefile.mk b/extensions/source/plugin/base/makefile.mk index a4a624af643f..5cf1d3f42d1f 100644 --- a/extensions/source/plugin/base/makefile.mk +++ b/extensions/source/plugin/base/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.8 $ +# $Revision: 1.9 $ # -# last change: $Author: rt $ $Date: 2005-09-08 19:50:31 $ +# last change: $Author: obo $ $Date: 2006-01-20 12:58:03 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -41,6 +41,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 + SLOFILES= \ $(SLO)$/plctrl.obj \ $(SLO)$/service.obj \ |