From e8f7d39b9dad8c7f29940a09219f82cf908791a2 Mon Sep 17 00:00:00 2001 From: Jan Holesovsky Date: Fri, 29 Apr 2011 19:19:30 +0200 Subject: Make vcl building. --- vcl/Library_vclplug_gtk.mk | 3 --- 1 file changed, 3 deletions(-) (limited to 'vcl/Library_vclplug_gtk.mk') diff --git a/vcl/Library_vclplug_gtk.mk b/vcl/Library_vclplug_gtk.mk index feb63e06e794..62f5c334a23c 100755 --- a/vcl/Library_vclplug_gtk.mk +++ b/vcl/Library_vclplug_gtk.mk @@ -33,7 +33,6 @@ $(eval $(call gb_Library_set_include,vclplug_gtk,\ -I$(SRCDIR)/vcl/inc/pch \ -I$(SRCDIR)/solenv/inc \ -I$(OUTDIR)/inc/offuh \ - -I$(OUTDIR)/inc/stl \ -I$(OUTDIR)/inc \ )) @@ -81,10 +80,8 @@ $(eval $(call gb_Library_add_linked_libs,vclplug_gtk,\ i18npaper \ i18nutil \ jvmaccess \ - stl \ cppu \ sal \ - vos3 \ X11 \ Xext \ SM \ -- cgit From bb471e9372c8da5d8351fb516a719fea9748dd89 Mon Sep 17 00:00:00 2001 From: David Tardon Date: Sat, 28 May 2011 07:06:17 +0200 Subject: fix build with ENABLE_DBUS --- vcl/Library_vclplug_gtk.mk | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'vcl/Library_vclplug_gtk.mk') diff --git a/vcl/Library_vclplug_gtk.mk b/vcl/Library_vclplug_gtk.mk index 62f5c334a23c..838df57d1d8e 100755 --- a/vcl/Library_vclplug_gtk.mk +++ b/vcl/Library_vclplug_gtk.mk @@ -48,6 +48,10 @@ $(eval $(call gb_Library_set_defs,vclplug_gtk,\ )) ifneq ($(ENABLE_DBUS),) +$(eval $(call gb_Library_set_include,vclplug_gtk,\ + $$(INCLUDE) \ + $(filter -I%,$(shell pkg-config --cflags dbus-glib-1)) \ +)) $(eval $(call gb_Library_set_defs,vclplug_gtk,\ $$(DEFS) \ -DENABLE_DBUS \ -- cgit From 46dd0c2cf16f386ded64d3654ae81248d9573ec1 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Sat, 28 May 2011 22:38:56 +0300 Subject: chmod -x --- vcl/Library_vclplug_gtk.mk | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 vcl/Library_vclplug_gtk.mk (limited to 'vcl/Library_vclplug_gtk.mk') diff --git a/vcl/Library_vclplug_gtk.mk b/vcl/Library_vclplug_gtk.mk old mode 100755 new mode 100644 -- cgit