From 246efa0d481c4b3bb55c1f53d954557cc027c008 Mon Sep 17 00:00:00 2001 From: Hans-Joachim Lankenau Date: Mon, 30 May 2011 18:08:50 +0200 Subject: ause130: #i117218# change .idl handling to gnu make --- sfx2/Library_qstart.mk | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'sfx2/Library_qstart.mk') diff --git a/sfx2/Library_qstart.mk b/sfx2/Library_qstart.mk index 0709f60ba5fa..3d6d6232bd7b 100755 --- a/sfx2/Library_qstart.mk +++ b/sfx2/Library_qstart.mk @@ -33,11 +33,15 @@ $(eval $(call gb_Library_set_include,qstart_gtk,\ -I$(SRCDIR)/sfx2/inc \ -I$(SRCDIR)/sfx2/inc/sfx2 \ -I$(SRCDIR)/sfx2/inc/pch \ - -I$(OUTDIR)/inc/offuh \ -I$(OUTDIR)/inc \ $(filter -I%,$(GTK_CFLAGS)) \ )) +$(eval $(call gb_Library_add_api,qstart_gtk,\ + udkapi \ + offapi \ +)) + $(eval $(call gb_Library_set_defs,qstart_gtk,\ $$(DEFS) \ -DDLL_NAME=$(notdir $(call gb_Library_get_target,sfx2)) \ -- cgit From 736b7fc2a701a65cdc87f36dc2741675644cf7ea Mon Sep 17 00:00:00 2001 From: Robert Nagy Date: Mon, 20 Jun 2011 11:43:55 +0200 Subject: correctly build GTK systray icon the setting was lost during move the GNU make Signed-off-by: Petr Mladek --- sfx2/Library_qstart.mk | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'sfx2/Library_qstart.mk') diff --git a/sfx2/Library_qstart.mk b/sfx2/Library_qstart.mk index 3d6d6232bd7b..881e78df5c37 100755 --- a/sfx2/Library_qstart.mk +++ b/sfx2/Library_qstart.mk @@ -48,6 +48,13 @@ $(eval $(call gb_Library_set_defs,qstart_gtk,\ -DENABLE_QUICKSTART_APPLET \ )) +ifeq ($(ENABLE_SYSTRAY_GTK),TRUE) +$(eval $(call gb_Library_set_defs,qstart_gtk,\ + $$(DEFS) \ + -DENABLE_SYSTRAY_GTK \ +)) +endif + $(eval $(call gb_Library_set_cflags,qstart_gtk,\ $$(CFLAGS) \ $(filter-out -I%,$(GTK_CFLAGS)) \ -- cgit alue='distro/cib/libreoffice-6-4'>distro/cib/libreoffice-6-4 LibreOffice 核心代码仓库文档基金会
summaryrefslogtreecommitdiff