diff options
| -rw-r--r-- | desktop/WinResTarget_quickstart.mk | 4 | ||||
| -rw-r--r-- | desktop/WinResTarget_sbase.mk | 7 | ||||
| -rw-r--r-- | desktop/WinResTarget_scalc.mk | 7 | ||||
| -rw-r--r-- | desktop/WinResTarget_sdraw.mk | 7 | ||||
| -rw-r--r-- | desktop/WinResTarget_simpress.mk | 7 | ||||
| -rw-r--r-- | desktop/WinResTarget_smath.mk | 7 | ||||
| -rw-r--r-- | desktop/WinResTarget_soffice.mk | 7 | ||||
| -rw-r--r-- | desktop/WinResTarget_sofficebin.mk | 7 | ||||
| -rw-r--r-- | desktop/WinResTarget_sweb.mk | 7 | ||||
| -rw-r--r-- | desktop/WinResTarget_swriter.mk | 7 | ||||
| -rw-r--r-- | extensions/WinResTarget_activex.mk | 7 | ||||
| -rw-r--r-- | extensions/WinResTarget_npsoplugin.mk | 2 | ||||
| -rw-r--r-- | fpicker/WinResTarget_fps.mk | 6 | ||||
| -rw-r--r-- | shell/WinResTarget_shlxthdl.mk | 2 | ||||
| -rw-r--r-- | solenv/gbuild/WinResTarget.mk | 25 | ||||
| -rw-r--r-- | solenv/gbuild/platform/WNT_INTEL_GCC.mk | 5 | ||||
| -rw-r--r-- | solenv/gbuild/platform/WNT_INTEL_MSC.mk | 5 | ||||
| -rw-r--r-- | vcl/WinResTarget_vcl.mk | 4 |
18 files changed, 60 insertions, 63 deletions
diff --git a/desktop/WinResTarget_quickstart.mk b/desktop/WinResTarget_quickstart.mk index 04dffbfe0e3a..8735fba2e9e1 100644 --- a/desktop/WinResTarget_quickstart.mk +++ b/desktop/WinResTarget_quickstart.mk @@ -33,10 +33,10 @@ $(eval $(call gb_WinResTarget_set_include,quickstart/src,\ -I$(SRCDIR)/sysui/desktop \ )) -$(eval $(call gb_WinResTarget_add_dependency,quickstart/src,\ +$(eval $(call gb_WinResTarget_add_dependencies,quickstart/src,\ sysui/desktop/icons/main_app.ico \ )) -$(eval $(call gb_WinResTarget_add_file,quickstart/src,desktop/win32/source/QuickStart/QuickStart)) +$(eval $(call gb_WinResTarget_set_rcfile,quickstart/src,desktop/win32/source/QuickStart/QuickStart)) # vim: set ts=4 sw=4 et: diff --git a/desktop/WinResTarget_sbase.mk b/desktop/WinResTarget_sbase.mk index f3f33f1ee75c..008e436b5358 100644 --- a/desktop/WinResTarget_sbase.mk +++ b/desktop/WinResTarget_sbase.mk @@ -32,18 +32,17 @@ $(eval $(call gb_WinResTarget_set_include,sbase/src,\ -I$(SRCDIR)/sysui/desktop \ )) -$(eval $(call gb_WinResTarget_set_defs,sbase/src,\ - $$(DEFS) \ +$(eval $(call gb_WinResTarget_add_defs,sbase/src,\ -DRES_APP_NAME=sbase \ -DRES_APP_ICON=icons/base_app.ico \ -DVERVARIANT=$(BUILD) \ -DRES_APP_VENDOR="$(OOO_VENDOR)" \ )) -$(eval $(call gb_WinResTarget_add_dependency,sbase/src,\ +$(eval $(call gb_WinResTarget_add_dependencies,sbase/src,\ sysui/desktop/icons/base_app.ico \ )) -$(eval $(call gb_WinResTarget_add_file,sbase/src,desktop/win32/source/applauncher/launcher)) +$(eval $(call gb_WinResTarget_set_rcfile,sbase/src,desktop/win32/source/applauncher/launcher)) # vim: set ts=4 sw=4 et: diff --git a/desktop/WinResTarget_scalc.mk b/desktop/WinResTarget_scalc.mk index 3b9fc0ec9de9..89a2d2dd66a9 100644 --- a/desktop/WinResTarget_scalc.mk +++ b/desktop/WinResTarget_scalc.mk @@ -32,18 +32,17 @@ $(eval $(call gb_WinResTarget_set_include,scalc/src,\ -I$(SRCDIR)/sysui/desktop \ )) -$(eval $(call gb_WinResTarget_set_defs,scalc/src,\ - $$(DEFS) \ +$(eval $(call gb_WinResTarget_add_defs,scalc/src,\ -DRES_APP_NAME=scalc \ -DRES_APP_ICON=icons/calc_app.ico \ -DVERVARIANT=$(BUILD) \ -DRES_APP_VENDOR="$(OOO_VENDOR)" \ )) -$(eval $(call gb_WinResTarget_add_dependency,scalc/src,\ +$(eval $(call gb_WinResTarget_add_dependencies,scalc/src,\ sysui/desktop/icons/calc_app.ico \ )) -$(eval $(call gb_WinResTarget_add_file,scalc/src,desktop/win32/source/applauncher/launcher)) +$(eval $(call gb_WinResTarget_set_rcfile,scalc/src,desktop/win32/source/applauncher/launcher)) # vim: set ts=4 sw=4 et: diff --git a/desktop/WinResTarget_sdraw.mk b/desktop/WinResTarget_sdraw.mk index 9bda5ceb5d48..44ef3062038e 100644 --- a/desktop/WinResTarget_sdraw.mk +++ b/desktop/WinResTarget_sdraw.mk @@ -32,19 +32,18 @@ $(eval $(call gb_WinResTarget_set_include,sdraw/src,\ -I$(SRCDIR)/sysui/desktop \ )) -$(eval $(call gb_WinResTarget_set_defs,sdraw/src,\ - $$(DEFS) \ +$(eval $(call gb_WinResTarget_add_defs,sdraw/src,\ -DRES_APP_NAME=sdraw \ -DRES_APP_ICON=icons/draw_app.ico \ -DVERVARIANT=$(BUILD) \ -DRES_APP_VENDOR="$(OOO_VENDOR)" \ )) -$(eval $(call gb_WinResTarget_add_dependency,sdraw/src,\ +$(eval $(call gb_WinResTarget_add_dependencies,sdraw/src,\ sysui/desktop/icons/draw_app.ico \ )) -$(eval $(call gb_WinResTarget_add_file,sdraw/src,desktop/win32/source/applauncher/launcher)) +$(eval $(call gb_WinResTarget_set_rcfile,sdraw/src,desktop/win32/source/applauncher/launcher)) # vim: set ts=4 sw=4 et: diff --git a/desktop/WinResTarget_simpress.mk b/desktop/WinResTarget_simpress.mk index 79aa10cc3f7d..224af5b10fc8 100644 --- a/desktop/WinResTarget_simpress.mk +++ b/desktop/WinResTarget_simpress.mk @@ -32,18 +32,17 @@ $(eval $(call gb_WinResTarget_set_include,simpress/src,\ -I$(SRCDIR)/sysui/desktop \ )) -$(eval $(call gb_WinResTarget_set_defs,simpress/src,\ - $$(DEFS) \ +$(eval $(call gb_WinResTarget_add_defs,simpress/src,\ -DRES_APP_NAME=simpress \ -DRES_APP_ICON=icons/impress_app.ico \ -DVERVARIANT=$(BUILD) \ -DRES_APP_VENDOR="$(OOO_VENDOR)" \ )) -$(eval $(call gb_WinResTarget_add_dependency,simpress/src,\ +$(eval $(call gb_WinResTarget_add_dependencies,simpress/src,\ sysui/desktop/icons/impress_app.ico \ )) -$(eval $(call gb_WinResTarget_add_file,simpress/src,desktop/win32/source/applauncher/launcher)) +$(eval $(call gb_WinResTarget_set_rcfile,simpress/src,desktop/win32/source/applauncher/launcher)) # vim: set ts=4 sw=4 et: diff --git a/desktop/WinResTarget_smath.mk b/desktop/WinResTarget_smath.mk index 9dbbcd07d4a4..e36eba1f0136 100644 --- a/desktop/WinResTarget_smath.mk +++ b/desktop/WinResTarget_smath.mk @@ -32,18 +32,17 @@ $(eval $(call gb_WinResTarget_set_include,smath/src,\ -I$(SRCDIR)/sysui/desktop \ )) -$(eval $(call gb_WinResTarget_set_defs,smath/src,\ - $$(DEFS) \ +$(eval $(call gb_WinResTarget_add_defs,smath/src,\ -DRES_APP_NAME=smath \ -DRES_APP_ICON=icons/math_app.ico \ -DVERVARIANT=$(BUILD) \ -DRES_APP_VENDOR="$(OOO_VENDOR)" \ )) -$(eval $(call gb_WinResTarget_add_dependency,smath/src,\ +$(eval $(call gb_WinResTarget_add_dependencies,smath/src,\ sysui/desktop/icons/math_app.ico \ )) -$(eval $(call gb_WinResTarget_add_file,smath/src,desktop/win32/source/applauncher/launcher)) +$(eval $(call gb_WinResTarget_set_rcfile,smath/src,desktop/win32/source/applauncher/launcher)) # vim: set ts=4 sw=4 et: diff --git a/desktop/WinResTarget_soffice.mk b/desktop/WinResTarget_soffice.mk index fe66aa59059a..5dac62c4334b 100644 --- a/desktop/WinResTarget_soffice.mk +++ b/desktop/WinResTarget_soffice.mk @@ -32,18 +32,17 @@ $(eval $(call gb_WinResTarget_set_include,soffice/src,\ -I$(SRCDIR)/sysui/desktop \ )) -$(eval $(call gb_WinResTarget_set_defs,soffice/src,\ - $$(DEFS) \ +$(eval $(call gb_WinResTarget_add_defs,soffice/src,\ -DRES_APP_NAME=soffice \ -DRES_APP_ICON=icons/main_app.ico \ -DVERVARIANT=$(BUILD) \ -DRES_APP_VENDOR="$(OOO_VENDOR)" \ )) -$(eval $(call gb_WinResTarget_add_dependency,soffice/src,\ +$(eval $(call gb_WinResTarget_add_dependencies,soffice/src,\ sysui/desktop/icons/main_app.ico \ )) -$(eval $(call gb_WinResTarget_add_file,soffice/src,desktop/win32/source/applauncher/launcher)) +$(eval $(call gb_WinResTarget_set_rcfile,soffice/src,desktop/win32/source/applauncher/launcher)) # vim: set ts=4 sw=4 et: diff --git a/desktop/WinResTarget_sofficebin.mk b/desktop/WinResTarget_sofficebin.mk index 334c9b780834..54f289bf91c4 100644 --- a/desktop/WinResTarget_sofficebin.mk +++ b/desktop/WinResTarget_sofficebin.mk @@ -32,18 +32,17 @@ $(eval $(call gb_WinResTarget_set_include,sofficebin/src,\ -I$(SRCDIR)/sysui/desktop \ )) -$(eval $(call gb_WinResTarget_set_defs,sofficebin/src,\ - $$(DEFS) \ +$(eval $(call gb_WinResTarget_add_defs,sofficebin/src,\ -DRES_APP_NAME=soffice \ -DRES_APP_ICON=icons/main_app.ico \ -DVERVARIANT=$(BUILD) \ -DRES_APP_VENDOR="$(OOO_VENDOR)" \ )) -$(eval $(call gb_WinResTarget_add_dependency,sofficebin/src,\ +$(eval $(call gb_WinResTarget_add_dependencies,sofficebin/src,\ sysui/desktop/icons/main_app.ico \ )) -$(eval $(call gb_WinResTarget_add_file,sofficebin/src,desktop/util/officeloader)) +$(eval $(call gb_WinResTarget_set_rcfile,sofficebin/src,desktop/util/officeloader)) # vim: set ts=4 sw=4 et: diff --git a/desktop/WinResTarget_sweb.mk b/desktop/WinResTarget_sweb.mk index 0ae85d99af39..36ba61847e63 100644 --- a/desktop/WinResTarget_sweb.mk +++ b/desktop/WinResTarget_sweb.mk @@ -32,18 +32,17 @@ $(eval $(call gb_WinResTarget_set_include,sweb/src,\ -I$(SRCDIR)/sysui/desktop \ )) -$(eval $(call gb_WinResTarget_set_defs,sweb/src,\ - $$(DEFS) \ +$(eval $(call gb_WinResTarget_add_defs,sweb/src,\ -DRES_APP_NAME=sweb \ -DRES_APP_ICON=icons/writer_app.ico \ -DVERVARIANT=$(BUILD) \ -DRES_APP_VENDOR="$(OOO_VENDOR)" \ )) -$(eval $(call gb_WinResTarget_add_dependency,sweb/src,\ +$(eval $(call gb_WinResTarget_add_dependencies,sweb/src,\ sysui/desktop/icons/writer_app.ico \ )) -$(eval $(call gb_WinResTarget_add_file,sweb/src,desktop/win32/source/applauncher/launcher)) +$(eval $(call gb_WinResTarget_set_rcfile,sweb/src,desktop/win32/source/applauncher/launcher)) # vim: set ts=4 sw=4 et: diff --git a/desktop/WinResTarget_swriter.mk b/desktop/WinResTarget_swriter.mk index 7b9ff2fdb149..fc68b9cd3e9a 100644 --- a/desktop/WinResTarget_swriter.mk +++ b/desktop/WinResTarget_swriter.mk @@ -32,18 +32,17 @@ $(eval $(call gb_WinResTarget_set_include,swriter/src,\ -I$(SRCDIR)/sysui/desktop \ )) -$(eval $(call gb_WinResTarget_set_defs,swriter/src,\ - $$(DEFS) \ +$(eval $(call gb_WinResTarget_add_defs,swriter/src,\ -DRES_APP_NAME=swriter \ -DRES_APP_ICON=icons/writer_app.ico \ -DVERVARIANT=$(BUILD) \ -DRES_APP_VENDOR="$(OOO_VENDOR)" \ )) -$(eval $(call gb_WinResTarget_add_dependency,swriter/src,\ +$(eval $(call gb_WinResTarget_add_dependencies,swriter/src,\ sysui/desktop/icons/writer_app.ico \ )) -$(eval $(call gb_WinResTarget_add_file,swriter/src,desktop/win32/source/applauncher/launcher)) +$(eval $(call gb_WinResTarget_set_rcfile,swriter/src,desktop/win32/source/applauncher/launcher)) # vim: set ts=4 sw=4 et: diff --git a/extensions/WinResTarget_activex.mk b/extensions/WinResTarget_activex.mk index 36a1629f5a9a..17a95319eecd 100644 --- a/extensions/WinResTarget_activex.mk +++ b/extensions/WinResTarget_activex.mk @@ -31,15 +31,14 @@ $(eval $(call gb_WinResTarget_WinResTarget,activex_res)) ifneq ($(PRODUCT),) -$(eval $(call gb_WinResTarget_set_defs,activex_res,\ - $$(DEFS) \ +$(eval $(call gb_WinResTarget_add_defs,activex_res,\ -DPRODUCT \ )) endif -$(eval $(call gb_WinResTarget_add_file,activex_res,extensions/source/activex/so_activex)) +$(eval $(call gb_WinResTarget_set_rcfile,activex_res,extensions/source/activex/so_activex)) -$(eval $(call gb_WinResTarget_set_defs,activex_res,\ +$(eval $(call gb_WinResTarget_add_defs,activex_res,\ $$(DEFS) \ -DSO_ACTIVEX_TLB_DIR=$(subst /,\\,$(subst $(SRCDIR),../../..,$(WORKDIR)/CustomTarget/extensions/source/activex/idl)) \ )) diff --git a/extensions/WinResTarget_npsoplugin.mk b/extensions/WinResTarget_npsoplugin.mk index 33926b34d64f..d6b1e9570fd1 100644 --- a/extensions/WinResTarget_npsoplugin.mk +++ b/extensions/WinResTarget_npsoplugin.mk @@ -30,6 +30,6 @@ $(eval $(call gb_WinResTarget_WinResTarget,npsoplugin_res)) -$(eval $(call gb_WinResTarget_add_file,npsoplugin_res,extensions/source/nsplugin/source/nsplugin_oo)) +$(eval $(call gb_WinResTarget_set_rcfile,npsoplugin_res,extensions/source/nsplugin/source/nsplugin_oo)) # vim:set shiftwidth=4 softtabstop=4 expandtab: diff --git a/fpicker/WinResTarget_fps.mk b/fpicker/WinResTarget_fps.mk index 2720a48fc2ba..80543ad00187 100644 --- a/fpicker/WinResTarget_fps.mk +++ b/fpicker/WinResTarget_fps.mk @@ -27,10 +27,6 @@ $(eval $(call gb_WinResTarget_WinResTarget,fps/src)) -$(eval $(call gb_WinResTarget_set_include,fps/src,\ - $$(INCLUDE) \ -)) - -$(eval $(call gb_WinResTarget_add_file,fps/src,fpicker/source/win32/filepicker/Fps)) +$(eval $(call gb_WinResTarget_set_rcfile,fps/src,fpicker/source/win32/filepicker/Fps)) # vim: set ts=4 sw=4 et: diff --git a/shell/WinResTarget_shlxthdl.mk b/shell/WinResTarget_shlxthdl.mk index 4c3478b71804..0a6aebd5f5ee 100644 --- a/shell/WinResTarget_shlxthdl.mk +++ b/shell/WinResTarget_shlxthdl.mk @@ -33,7 +33,7 @@ $(eval $(call gb_WinResTarget_set_include,shlxthdl,\ -I$(SRCDIR)/shell/inc \ )) -$(eval $(call gb_WinResTarget_add_file,shlxthdl,shell/source/win32/shlxthandler/res/shlxthdl)) +$(eval $(call gb_WinResTarget_set_rcfile,shlxthdl,shell/source/win32/shlxthandler/res/shlxthdl)) $(call gb_WinResTarget_get_target,shlxthdl) : $(call gb_CustomTarget_get_workdir,shell/source/win32/shlxthandler/res)/shlxthdl_impl.rc diff --git a/solenv/gbuild/WinResTarget.mk b/solenv/gbuild/WinResTarget.mk index b3c5b68126bc..97050236a8ea 100644 --- a/solenv/gbuild/WinResTarget.mk +++ b/solenv/gbuild/WinResTarget.mk @@ -43,8 +43,12 @@ $(call gb_WinResTarget_get_clean_target,%) : rm -f $(call gb_WinResTarget_get_target,$*)) define gb_WinResTarget_set_defs -$(call gb_WinResTarget_get_target,$(1)) : DEFS := $(2) -$(call gb_WinResTarget_get_dep_target,$(1)) : DEFS := $(2) +$$(call gb_Output_error,gb_WinResTarget_set_defs: use gb_WinResTarget_add_defs instead.) +endef + +define gb_WinResTarget_add_defs +$(call gb_WinResTarget_get_target,$(1)) : DEFS += $(2) +$(call gb_WinResTarget_get_dep_target,$(1)) : DEFS += $(2) endef @@ -54,14 +58,23 @@ $(call gb_WinResTarget_get_target,$(1)) : INCLUDE := $(2) endef define gb_WinResTarget_add_file -$(call gb_WinResTarget_get_clean_target,$(1)) : RCFILE=$(SRCDIR)/$(strip $(2)).rc -$(call gb_WinResTarget_get_target,$(1)) : RCFILE=$(SRCDIR)/$(strip $(2)).rc -$(call gb_WinResTarget_get_target,$(1)) : $(SRCDIR)/$(strip $(2)).rc +$$(call gb_Output_error,gb_WinResTarget_add_file: use gb_WinResTarget_set_rcfile instead.) +endef + +define gb_WinResTarget_set_rcfile +$(call gb_WinResTarget_get_clean_target,$(1)) : RCFILE := $(SRCDIR)/$(strip $(2)).rc +$(call gb_WinResTarget_get_target,$(1)) : RCFILE := $(SRCDIR)/$(strip $(2)).rc +$(call gb_WinResTarget_get_target,$(1)) : $$(RCFILE) endef define gb_WinResTarget_add_dependency -$(call gb_WinResTarget_get_target,$(1)) : $(foreach file,$(2),$(SRCDIR)/$(file)) +$(call gb_WinResTarget_get_target,$(1)) : $(SRCDIR)/$(strip $(2)) + +endef + +define gb_WinResTarget_add_dependencies +$(foreach dep,$(2),$(call gb_WinResTarget_add_dependency,$(1),$(dep))) endef diff --git a/solenv/gbuild/platform/WNT_INTEL_GCC.mk b/solenv/gbuild/platform/WNT_INTEL_GCC.mk index ed82b8fd9912..7c25c8b4ece3 100644 --- a/solenv/gbuild/platform/WNT_INTEL_GCC.mk +++ b/solenv/gbuild/platform/WNT_INTEL_GCC.mk @@ -314,9 +314,8 @@ endef define gb_Library_add_default_nativeres $(call gb_WinResTarget_WinResTarget_init,$(2)) -$(call gb_WinResTarget_add_file,$(2),solenv/inc/shlinfo) -$(call gb_WinResTarget_set_defs,$(2),\ - $$(DEFS) \ +$(call gb_WinResTarget_set_rcfile,$(2),solenv/inc/shlinfo) +$(call gb_WinResTarget_add_defs,$(2),\ -DVERVARIANT="$(BUILD)" \ -DRES_APP_VENDOR="$(OOO_VENDOR)" \ -DADDITIONAL_VERINFO1="" \ diff --git a/solenv/gbuild/platform/WNT_INTEL_MSC.mk b/solenv/gbuild/platform/WNT_INTEL_MSC.mk index 21a93d08e609..ee340c71cad3 100644 --- a/solenv/gbuild/platform/WNT_INTEL_MSC.mk +++ b/solenv/gbuild/platform/WNT_INTEL_MSC.mk @@ -488,9 +488,8 @@ endef define gb_Library_add_default_nativeres $(call gb_WinResTarget_WinResTarget_init,$(2)) -$(call gb_WinResTarget_add_file,$(2),solenv/inc/shlinfo) -$(call gb_WinResTarget_set_defs,$(2),\ - $$(DEFS) \ +$(call gb_WinResTarget_set_rcfile,$(2),solenv/inc/shlinfo) +$(call gb_WinResTarget_add_defs,$(2),\ -DVERVARIANT="$(BUILD)" \ -DRES_APP_VENDOR="$(OOO_VENDOR)" \ -DORG_NAME="$(call gb_Library_get_dllname,$(1))"\ diff --git a/vcl/WinResTarget_vcl.mk b/vcl/WinResTarget_vcl.mk index 4c81ba8ab63e..4580429d3ff9 100644 --- a/vcl/WinResTarget_vcl.mk +++ b/vcl/WinResTarget_vcl.mk @@ -33,10 +33,10 @@ $(eval $(call gb_WinResTarget_set_include,vcl/src,\ -I$(SRCDIR)/vcl/inc \ )) -$(eval $(call gb_WinResTarget_add_file,vcl/src,\ +$(eval $(call gb_WinResTarget_set_rcfile,vcl/src,\ vcl/win/source/src/salsrc \ )) -$(eval $(call gb_WinResTarget_add_dependency,vcl/src,\ +$(eval $(call gb_WinResTarget_add_dependencies,vcl/src,\ vcl/win/source/src/dtext.cur \ vcl/win/source/src/50.bmp \ vcl/win/source/src/copydata.cur \ |