diff options
| author | Matúš Kukan <matus.kukan@gmail.com> | 2012-01-11 18:20:48 +0100 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@gmail.com> | 2012-01-11 20:20:17 +0100 |
| commit | 134803653fecd62f64bb063df6b48713626e94b7 (patch) | |
| tree | b7c5bf559ec5bf82bd2679280d7fec038ab183ce /extensions/Library_pl.mk | |
| parent | b99010d1eba38c14719e9b34fbaa57591e3aed42 (diff) | |
tweak makefiles after np_sdk is in tail_build
Also change <npsdk/npapi.h> to "npapi.h"
Diffstat (limited to 'extensions/Library_pl.mk')
| -rw-r--r-- | extensions/Library_pl.mk | 21 |
1 files changed, 5 insertions, 16 deletions
diff --git a/extensions/Library_pl.mk b/extensions/Library_pl.mk index cbe3dd01fe15..9a9dbdef9620 100644 --- a/extensions/Library_pl.mk +++ b/extensions/Library_pl.mk @@ -32,10 +32,13 @@ $(eval $(call gb_Library_Library,pl)) $(eval $(call gb_Library_set_componentfile,pl,extensions/source/plugin/pl)) +$(eval $(call gb_Library_add_external_headers,pl,np_sdk_inc)) + +$(eval $(call gb_Library_use_external,pl,mozilla_headers)) + $(eval $(call gb_Library_set_include,pl,\ $$(INCLUDE) \ -I$(SRCDIR)/extensions/source/plugin/inc \ - -I$(OUTDIR)/inc/mozilla/plugin \ )) $(eval $(call gb_Library_add_api,pl,\ @@ -43,25 +46,11 @@ $(eval $(call gb_Library_add_api,pl,\ udkapi \ )) -ifneq ($(SOLAR_JAVA),) - -$(eval $(call gb_Library_set_include,pl,\ - $$(INCLUDE) \ - -I$(OUTDIR)/mozilla/java \ - -I$(OUTDIR)/mozilla/nspr \ -)) - +ifeq ($(SOLAR_JAVA),TRUE) $(eval $(call gb_Library_add_defs,pl,\ -DOJI \ )) -ifeq ($(GUIBASE),aqua) -$(eval $(call gb_Library_set_include,pl,\ - $$(INCLUDE) \ - -I$(OUTDIR)/npsdk \ -)) -endif # GUIBASE=aqua - endif # SOLAR_JAVA=YES ifeq ($(SYSTEM_MOZILLA),YES) |