diff options
| -rw-r--r-- | RepositoryExternal.mk | 1 | ||||
| -rw-r--r-- | extensions/Executable_pluginapp.bin.mk | 4 | ||||
| -rw-r--r-- | extensions/Library_npsoplugin.mk | 12 | ||||
| -rw-r--r-- | extensions/Library_pl.mk | 21 | ||||
| -rw-r--r-- | extensions/source/nsplugin/source/npshell.cxx | 2 | ||||
| -rw-r--r-- | extensions/source/plugin/inc/plugin/aqua/sysplug.hxx | 2 | ||||
| -rw-r--r-- | extensions/source/plugin/inc/plugin/unx/plugcon.hxx | 2 | ||||
| -rw-r--r-- | extensions/source/plugin/inc/plugin/win/sysplug.hxx | 2 | ||||
| -rw-r--r-- | solenv/gbuild/Library.mk | 1 |
9 files changed, 18 insertions, 29 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index e986ac3528b8..514a5b7dd4ef 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -924,7 +924,6 @@ $(eval $(call gb_LinkTarget_set_include,$(1),\ endef endif #SYSTEM_MOZILLA_HEADERS -#TODO np_sdk $(eval $(call gb_LinkTarget_add_external_headers,$(1),np_sdk)) # MacOSX-only frameworks ############################################ diff --git a/extensions/Executable_pluginapp.bin.mk b/extensions/Executable_pluginapp.bin.mk index 50b606cb4224..2b046a333028 100644 --- a/extensions/Executable_pluginapp.bin.mk +++ b/extensions/Executable_pluginapp.bin.mk @@ -30,6 +30,10 @@ $(eval $(call gb_Executable_Executable,pluginapp.bin)) +$(eval $(call gb_Executable_add_external_headers,pluginapp.bin,np_sdk_inc)) + +$(eval $(call gb_Executable_use_external,pluginapp.bin,mozilla_headers)) + $(eval $(call gb_Executable_set_include,pluginapp.bin,\ $$(INCLUDE) \ -I$(SRCDIR)/extensions/source/plugin/inc \ diff --git a/extensions/Library_npsoplugin.mk b/extensions/Library_npsoplugin.mk index 1a30d13532d1..94d9d237bb06 100644 --- a/extensions/Library_npsoplugin.mk +++ b/extensions/Library_npsoplugin.mk @@ -32,12 +32,12 @@ $(eval $(call gb_Library_Library,npsoplugin)) $(eval $(call gb_Library_use_external,npsoplugin,mozilla_headers)) -ifeq ($(GUI),UNX) - -$(eval $(call gb_Library_add_ldflags,npsoplugin,\ - $(OUTDIR)/lib/npunix.o \ +$(eval $(call gb_Library_add_linked_static_libs,npsoplugin,\ + nputils \ )) +ifeq ($(GUI),UNX) + $(eval $(call gb_Library_add_libs,npsoplugin,\ -ldl \ )) @@ -58,10 +58,6 @@ endif # GUI=UNX ifeq ($(GUI),WNT) -$(eval $(call gb_Library_add_ldflags,npsoplugin,\ - $(OUTDIR)/lib/npwin.obj \ -)) - $(eval $(call gb_Library_add_linked_static_libs,npsoplugin,\ ooopathutils \ )) 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) diff --git a/extensions/source/nsplugin/source/npshell.cxx b/extensions/source/nsplugin/source/npshell.cxx index cdb164b052c8..7e5749ba9a2a 100644 --- a/extensions/source/nsplugin/source/npshell.cxx +++ b/extensions/source/nsplugin/source/npshell.cxx @@ -69,7 +69,7 @@ #include "boost/scoped_array.hpp" #include "tools/pathutils.hxx" -#include <npsdk/npapi.h> +#include "npapi.h" #include "npshell.hxx" #include "so_env.hxx" #include "so_msg.hxx" diff --git a/extensions/source/plugin/inc/plugin/aqua/sysplug.hxx b/extensions/source/plugin/inc/plugin/aqua/sysplug.hxx index ebf302504cd7..df8e96681b45 100644 --- a/extensions/source/plugin/inc/plugin/aqua/sysplug.hxx +++ b/extensions/source/plugin/inc/plugin/aqua/sysplug.hxx @@ -40,7 +40,7 @@ #undef uint32 #define XP_MAC -#include "npsdk/npapi.h" +#include "npapi.h" #include "npsdk/npupp.h" #include "plugin/plcom.hxx" diff --git a/extensions/source/plugin/inc/plugin/unx/plugcon.hxx b/extensions/source/plugin/inc/plugin/unx/plugcon.hxx index 05740842de45..ba9317680d71 100644 --- a/extensions/source/plugin/inc/plugin/unx/plugcon.hxx +++ b/extensions/source/plugin/inc/plugin/unx/plugcon.hxx @@ -77,7 +77,7 @@ extern "C" { extern "C" { #include <npsdk/npupp.h> } -#include <npsdk/npapi.h> +#include "npapi.h" #if NP_VERSION_MINOR < 17 // compatibility hack: compile with older NPN api header, but define diff --git a/extensions/source/plugin/inc/plugin/win/sysplug.hxx b/extensions/source/plugin/inc/plugin/win/sysplug.hxx index 0ac09f5e3da5..b512d199d499 100644 --- a/extensions/source/plugin/inc/plugin/win/sysplug.hxx +++ b/extensions/source/plugin/inc/plugin/win/sysplug.hxx @@ -35,7 +35,7 @@ #include <tchar.h> #pragma pack( push, 8 ) -#include <npsdk/npapi.h> +#include "npapi.h" #include <npsdk/npupp.h> #pragma pack( pop ) diff --git a/solenv/gbuild/Library.mk b/solenv/gbuild/Library.mk index 13258b8c3438..72599c69704c 100644 --- a/solenv/gbuild/Library.mk +++ b/solenv/gbuild/Library.mk @@ -176,6 +176,7 @@ $(eval $(foreach method,\ add_linked_static_libs \ use_external \ use_externals \ + add_external_headers \ add_package_headers \ add_sdi_headers \ export_objects_list \ |