diff options
author | Rüdiger Timm <rt@openoffice.org> | 2005-03-30 10:41:52 +0000 |
---|---|---|
committer | Rüdiger Timm <rt@openoffice.org> | 2005-03-30 10:41:52 +0000 |
commit | 726b3c8cb9750540e3fc40c4b37aec6ae2079a90 (patch) | |
tree | 65357884181bf59dbd309bd6c9077c02c9372f5b /extensions/source/nsplugin | |
parent | a09a51810af73b0948fe0ac74a6efc94dfa63b7d (diff) |
INTEGRATION: CWS systemmozilla (1.9.12); FILE MERGED
2005/02/14 10:17:13 rene 1.9.12.1: #i17187# use system mozilla ... (patch)
make extensions/nsplugin build with headers from system mozilla
Diffstat (limited to 'extensions/source/nsplugin')
-rw-r--r-- | extensions/source/nsplugin/source/makefile.mk | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/extensions/source/nsplugin/source/makefile.mk b/extensions/source/nsplugin/source/makefile.mk index 346fe1d67842..b3dde9f9e570 100644 --- a/extensions/source/nsplugin/source/makefile.mk +++ b/extensions/source/nsplugin/source/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.9 $ +# $Revision: 1.10 $ # -# last change: $Author: kz $ $Date: 2005-01-18 15:19:15 $ +# last change: $Author: rt $ $Date: 2005-03-30 11:41:52 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -80,6 +80,11 @@ dummy: .ELSE # "$(ENABLE_GTK)"=="" .IF "$(OS)"=="LINUX" || "$(OS)"=="FREEBSD" INC+= -DNP_LINUX +.IF "$(SYSTEM_MOZILLA)" == "YES" +INCPRE=-I$(MOZ_INC)/nspr -I$(MOZ_INC)/java -I$(MOZ_INC)/plugin +# not sure about -DMOZ_X11 but otheriwse some struct member don't exist... +CFLAGS+=-DSYSTEM_MOZILLA -DMOZ_X11 +.ENDIF .ENDIF PKGCONFIG_MODULES=gtk+-2.0 .INCLUDE: pkg_config.mk |