diff options
| author | Oliver Bolte <obo@openoffice.org> | 2006-01-20 11:59:15 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2006-01-20 11:59:15 +0000 |
| commit | 29279069c442e24d02164f939b6d1a19acc6946a (patch) | |
| tree | 0344618df36342e89eb9f9660715aca25cbe78f2 /extensions | |
| parent | ac000d5cd58e7fbaac70efd2624c8a3f024a1486 (diff) | |
INTEGRATION: CWS vcl49 (1.8.60); FILE MERGED
2005/12/14 15:44:29 pl 1.8.60.1: #i56878# use mozilla headers instead of npsdk, use OJI definition
Diffstat (limited to 'extensions')
| -rw-r--r-- | extensions/source/plugin/unx/makefile.mk | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/extensions/source/plugin/unx/makefile.mk b/extensions/source/plugin/unx/makefile.mk index c39cad463967..edd342fdc71d 100644 --- a/extensions/source/plugin/unx/makefile.mk +++ b/extensions/source/plugin/unx/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:55:36 $ +# last change: $Author: obo $ $Date: 2006-01-20 12:59:15 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -42,6 +42,13 @@ TARGETTYPE=CUI # --- Files -------------------------------------------------------- +INCPRE+=-I$(SOLARINCDIR)$/mozilla$/plugin +.IF "$(SOLAR_JAVA)" != "" +INCPRE+=-I$(SOLARINCDIR)$/mozilla$/java +INCPRE+=-I$(SOLARINCDIR)$/mozilla$/nspr +CDEFS+=-DOJI +.ENDIF + SLOFILES=\ $(SLO)$/nppapi.obj \ $(SLO)$/sysplug.obj \ |