Kaydet (Commit) 44958240 authored tarafından Michael Stahl's avatar Michael Stahl

extensions: add np_sdk_inc to mozilla_headers external

üst 4c50f23f
...@@ -1034,6 +1034,7 @@ endef ...@@ -1034,6 +1034,7 @@ endef
else #!SYSTEM_MOZILLA_HEADERS else #!SYSTEM_MOZILLA_HEADERS
define gb_LinkTarget__use_mozilla_headers define gb_LinkTarget__use_mozilla_headers
$(eval $(call gb_LinkTarget_use_package,$(1),np_sdk_inc))
$(eval $(call gb_LinkTarget_set_include,$(1),\ $(eval $(call gb_LinkTarget_set_include,$(1),\
-I$(OUTDIR)/inc/npsdk \ -I$(OUTDIR)/inc/npsdk \
$$(INCLUDE) \ $$(INCLUDE) \
......
...@@ -30,8 +30,6 @@ ...@@ -30,8 +30,6 @@
$(eval $(call gb_Executable_Executable,pluginapp.bin)) $(eval $(call gb_Executable_Executable,pluginapp.bin))
$(eval $(call gb_Executable_use_package,pluginapp.bin,np_sdk_inc))
$(eval $(call gb_Executable_use_external,pluginapp.bin,mozilla_headers)) $(eval $(call gb_Executable_use_external,pluginapp.bin,mozilla_headers))
$(eval $(call gb_Executable_set_include,pluginapp.bin,\ $(eval $(call gb_Executable_set_include,pluginapp.bin,\
......
...@@ -32,8 +32,6 @@ $(eval $(call gb_Library_Library,pl)) ...@@ -32,8 +32,6 @@ $(eval $(call gb_Library_Library,pl))
$(eval $(call gb_Library_set_componentfile,pl,extensions/source/plugin/pl)) $(eval $(call gb_Library_set_componentfile,pl,extensions/source/plugin/pl))
$(eval $(call gb_Library_use_package,pl,np_sdk_inc))
$(eval $(call gb_Library_use_external,pl,mozilla_headers)) $(eval $(call gb_Library_use_external,pl,mozilla_headers))
$(eval $(call gb_Library_set_include,pl,\ $(eval $(call gb_Library_set_include,pl,\
......
...@@ -31,8 +31,6 @@ endif ...@@ -31,8 +31,6 @@ endif
$(eval $(call gb_StaticLibrary_StaticLibrary,plugcon)) $(eval $(call gb_StaticLibrary_StaticLibrary,plugcon))
$(eval $(call gb_StaticLibrary_use_package,plugcon,np_sdk_inc))
$(eval $(call gb_StaticLibrary_use_external,plugcon,mozilla_headers)) $(eval $(call gb_StaticLibrary_use_external,plugcon,mozilla_headers))
$(eval $(call gb_StaticLibrary_set_include,plugcon,\ $(eval $(call gb_StaticLibrary_set_include,plugcon,\
......
...@@ -27,8 +27,6 @@ ...@@ -27,8 +27,6 @@
$(eval $(call gb_StaticLibrary_StaticLibrary,nputils)) $(eval $(call gb_StaticLibrary_StaticLibrary,nputils))
$(eval $(call gb_StaticLibrary_use_package,nputils,np_sdk_inc))
$(eval $(call gb_StaticLibrary_use_externals,nputils,\ $(eval $(call gb_StaticLibrary_use_externals,nputils,\
mozilla_headers \ mozilla_headers \
)) ))
...@@ -37,19 +35,16 @@ ifeq ($(GUIBASE),aqua) ...@@ -37,19 +35,16 @@ ifeq ($(GUIBASE),aqua)
$(eval $(call gb_StaticLibrary_add_defs,nputils,\ $(eval $(call gb_StaticLibrary_add_defs,nputils,\
-DNO_X11 \ -DNO_X11 \
)) ))
endif endif
ifeq ($(OS),WNT) ifeq ($(OS),WNT)
$(eval $(call gb_StaticLibrary_add_exception_objects,nputils,\ $(eval $(call gb_StaticLibrary_add_exception_objects,nputils,\
np_sdk/mozsrc/npwin \ np_sdk/mozsrc/npwin \
)) ))
else else
$(eval $(call gb_StaticLibrary_add_cobjects,nputils,\ $(eval $(call gb_StaticLibrary_add_cobjects,nputils,\
np_sdk/mozsrc/npunix \ np_sdk/mozsrc/npunix \
)) ))
endif endif
# vim: set noet sw=4 ts=4: # vim: set noet sw=4 ts=4:
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment