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_vcl.mk | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'vcl/Library_vcl.mk') diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk index e8ad1bcaed64..f7e8e25693d5 100755 --- a/vcl/Library_vcl.mk +++ b/vcl/Library_vcl.mk @@ -36,6 +36,7 @@ $(eval $(call gb_Library_set_componentfile,vcl,vcl/vcl.unx)) endif $(eval $(call gb_Library_add_package_headers,vcl,vcl_inc)) +$(eval $(call gb_Library_add_package_headers,vcl,vcl_afmhash)) $(eval $(call gb_Library_set_include,vcl,\ $$(INCLUDE) \ @@ -43,8 +44,8 @@ $(eval $(call gb_Library_set_include,vcl,\ -I$(SRCDIR)/vcl/inc/pch \ -I$(SRCDIR)/solenv/inc \ -I$(OUTDIR)/inc/offuh \ - -I$(OUTDIR)/inc/stl \ -I$(OUTDIR)/inc \ + -I$(WORKDIR)/CustomTarget/vcl/unx/generic/fontmanager \ )) ifeq ($(GUIBASE),unx) $(eval $(call gb_Library_set_cxxflags,vcl,\ @@ -74,10 +75,8 @@ $(eval $(call gb_Library_add_linked_libs,vcl,\ i18npaper \ i18nutil \ jvmaccess \ - stl \ cppu \ sal \ - vos3 \ $(gb_STDLIBS) \ )) @@ -251,6 +250,7 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\ vcl/source/app/salvtables \ vcl/source/app/session \ vcl/source/app/settings \ + vcl/source/app/solarmutex \ vcl/source/app/sound \ vcl/source/app/stdtext \ vcl/source/app/svapp \ @@ -428,14 +428,11 @@ $(eval $(call gb_Library_set_defs,vcl,\ -DENABLE_GRAPHITE \ )) $(eval $(call gb_Library_add_exception_objects,vcl,\ - vcl/source/glyphs/graphite_cache \ vcl/source/glyphs/graphite_features \ vcl/source/glyphs/graphite_layout \ - vcl/source/glyphs/graphite_textsrc \ )) ifeq ($(GUIBASE),unx) $(eval $(call gb_Library_add_exception_objects,vcl,\ - vcl/source/glyphs/graphite_adaptors \ vcl/source/glyphs/graphite_serverfont \ )) ifeq ($(SYSTEM_GRAPHITE),YES) @@ -445,7 +442,7 @@ $(eval $(call gb_Library_set_ldflags,vcl,\ )) else $(eval $(call gb_Library_add_linked_static_libs,vcl,\ - graphite \ + graphite2_off \ )) endif endif -- cgit From 73b79fe869dee44b26d79d9e448fa95544a375e7 Mon Sep 17 00:00:00 2001 From: Jan Holesovsky Date: Wed, 4 May 2011 15:38:24 +0200 Subject: Add forgotten vcl/source/app/brand.cxx. --- vcl/Library_vcl.mk | 1 + 1 file changed, 1 insertion(+) (limited to 'vcl/Library_vcl.mk') diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk index f7e8e25693d5..c8372fac3610 100755 --- a/vcl/Library_vcl.mk +++ b/vcl/Library_vcl.mk @@ -242,6 +242,7 @@ $(eval $(call gb_Library_add_cobjects,vcl,\ vcl/source/fontsubset/list \ )) $(eval $(call gb_Library_add_exception_objects,vcl,\ + vcl/source/app/brand \ vcl/source/app/dbggui \ vcl/source/app/dndhelp \ vcl/source/app/help \ -- cgit From 9ff135581cc761b8243c93e1d77122b7849682e6 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Sat, 28 May 2011 22:38:33 +0300 Subject: Attempt to fix vcl build on Windows --- vcl/Library_vcl.mk | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) (limited to 'vcl/Library_vcl.mk') diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk index 44df1f03ffde..06bd0d7d8090 100755 --- a/vcl/Library_vcl.mk +++ b/vcl/Library_vcl.mk @@ -40,12 +40,12 @@ $(eval $(call gb_Library_add_package_headers,vcl,vcl_afmhash)) $(eval $(call gb_Library_set_include,vcl,\ $$(INCLUDE) \ - -I$(SRCDIR)/vcl/inc \ - -I$(SRCDIR)/vcl/inc/pch \ + -I$(realpath $(SRCDIR)/vcl/inc) \ + -I$(realpath $(SRCDIR)/vcl/inc/pch) \ -I$(SRCDIR)/solenv/inc \ -I$(OUTDIR)/inc/offuh \ -I$(OUTDIR)/inc \ - -I$(WORKDIR)/CustomTarget/vcl/unx/generic/fontmanager \ + -I$(WORKDIR)/CustomTarget/vcl/unx/generic/fontmanager \ )) ifeq ($(GUIBASE),unx) $(eval $(call gb_Library_set_cxxflags,vcl,\ @@ -80,13 +80,6 @@ $(eval $(call gb_Library_add_linked_libs,vcl,\ $(gb_STDLIBS) \ )) -ifneq ($(ENABLE_GRAPHITE),) -ifeq ($(OS),WNT) -$(eval $(call gb_Library_add_linked_libs,vcl,\ - graphite_dll \ -)) -endif -endif ifeq ($(GUIBASE),unx) $(eval $(call gb_Library_add_linked_libs,vcl,\ freetype \ -- 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_vcl.mk | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 vcl/Library_vcl.mk (limited to 'vcl/Library_vcl.mk') diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk old mode 100755 new mode 100644 -- cgit From 3b11d0b97a5659a913e68bf31ab05552813f7a7b Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Sun, 29 May 2011 18:42:15 +0300 Subject: Link with graphite2_off on Windows, too --- vcl/Library_vcl.mk | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'vcl/Library_vcl.mk') diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk index 06bd0d7d8090..bea3f652a597 100644 --- a/vcl/Library_vcl.mk +++ b/vcl/Library_vcl.mk @@ -439,6 +439,10 @@ $(eval $(call gb_Library_add_linked_static_libs,vcl,\ graphite2_off \ )) endif +else +$(eval $(call gb_Library_add_linked_libs,vcl,\ + graphite2_off \ +)) endif endif -- cgit From 00f5e8f62362a2db094e5a954ec095a63c47246a Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Mon, 30 May 2011 18:02:14 +0300 Subject: Link with the "version" library on Windows --- vcl/Library_vcl.mk | 1 + 1 file changed, 1 insertion(+) (limited to 'vcl/Library_vcl.mk') diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk index bea3f652a597..d663d462d972 100644 --- a/vcl/Library_vcl.mk +++ b/vcl/Library_vcl.mk @@ -442,6 +442,7 @@ endif else $(eval $(call gb_Library_add_linked_libs,vcl,\ graphite2_off \ + version \ )) endif endif -- cgit