diff options
| -rw-r--r-- | extensions/WinResTarget_activex.mk | 6 | ||||
| -rw-r--r-- | shell/WinResTarget_shlxthdl.mk | 7 |
2 files changed, 8 insertions, 5 deletions
diff --git a/extensions/WinResTarget_activex.mk b/extensions/WinResTarget_activex.mk index 17a95319eecd..2279607d7832 100644 --- a/extensions/WinResTarget_activex.mk +++ b/extensions/WinResTarget_activex.mk @@ -30,6 +30,10 @@ $(eval $(call gb_WinResTarget_WinResTarget,activex_res)) +$(eval $(call gb_WinResTarget_use_custom_headers,activex_res,\ + extensions/source/activex/idl \ +)) + ifneq ($(PRODUCT),) $(eval $(call gb_WinResTarget_add_defs,activex_res,\ -DPRODUCT \ @@ -43,6 +47,4 @@ $(eval $(call gb_WinResTarget_add_defs,activex_res,\ -DSO_ACTIVEX_TLB_DIR=$(subst /,\\,$(subst $(SRCDIR),../../..,$(WORKDIR)/CustomTarget/extensions/source/activex/idl)) \ )) -$(call gb_WinResTarget_get_target,activex_res) : $(WORKDIR)/CustomTarget/extensions/source/activex/idl/so_activex.tlb - # vim:set shiftwidth=4 softtabstop=4 expandtab: diff --git a/shell/WinResTarget_shlxthdl.mk b/shell/WinResTarget_shlxthdl.mk index 0a6aebd5f5ee..f6392757fb66 100644 --- a/shell/WinResTarget_shlxthdl.mk +++ b/shell/WinResTarget_shlxthdl.mk @@ -29,12 +29,13 @@ $(eval $(call gb_WinResTarget_WinResTarget,shlxthdl)) $(eval $(call gb_WinResTarget_set_include,shlxthdl,\ $$(INCLUDE) \ - -I$(WORKDIR)/CustomTarget/shell/source/win32/shlxthandler/res \ -I$(SRCDIR)/shell/inc \ )) -$(eval $(call gb_WinResTarget_set_rcfile,shlxthdl,shell/source/win32/shlxthandler/res/shlxthdl)) +$(eval $(call gb_WinResTarget_use_custom_headers,shlxthdl,\ + shell/source/win32/shlxthandler/res \ +)) -$(call gb_WinResTarget_get_target,shlxthdl) : $(call gb_CustomTarget_get_workdir,shell/source/win32/shlxthandler/res)/shlxthdl_impl.rc +$(eval $(call gb_WinResTarget_set_rcfile,shlxthdl,shell/source/win32/shlxthandler/res/shlxthdl)) # vim: set shiftwidth=4 tabstop=4 noexpandtab: |