summaryrefslogtreecommitdiffstats
path: root/desktop/WinResTarget_sofficebin.mk
diff options
context:
space:
mode:
authorDavid Tardon <dtardon@redhat.com>2012-04-30 14:53:11 +0200
committerDavid Tardon <dtardon@redhat.com>2012-05-29 07:33:59 +0200
commit7d6eb69950df97a12fc723bada1eb7c1839740ca (patch)
tree2a0c5971a0df8722aeeb14473fabb18f6bdf4992 /desktop/WinResTarget_sofficebin.mk
parentset all kde4 libs in configure (diff)
downloadcore-7d6eb69950df97a12fc723bada1eb7c1839740ca.tar.gz
core-7d6eb69950df97a12fc723bada1eb7c1839740ca.zip
rename functions for consistency with the rest of gbuild
Change-Id: I572a8a6dc9da4f63b7c937748b3013bab60bb6bb
Diffstat (limited to 'desktop/WinResTarget_sofficebin.mk')
-rw-r--r--desktop/WinResTarget_sofficebin.mk7
1 files changed, 3 insertions, 4 deletions
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: