diff options
| -rw-r--r-- | vcl/AllLangResTarget_vcl.mk | 2 | ||||
| -rw-r--r-- | vcl/Library_desktop_detector.mk | 4 | ||||
| -rwxr-xr-x | vcl/Library_vcl.mk | 13 | ||||
| -rwxr-xr-x | vcl/StaticLibrary_vclmain.mk | 4 | ||||
| -rwxr-xr-x | vcl/WinResTarget_vcl.mk | 2 |
5 files changed, 9 insertions, 16 deletions
diff --git a/vcl/AllLangResTarget_vcl.mk b/vcl/AllLangResTarget_vcl.mk index 9a3453af2810..307f8ae27754 100644 --- a/vcl/AllLangResTarget_vcl.mk +++ b/vcl/AllLangResTarget_vcl.mk @@ -37,7 +37,7 @@ $(eval $(call gb_SrsTarget_SrsTarget,vcl/source/src)) $(eval $(call gb_SrsTarget_set_include,vcl/source/src,\ $$(INCLUDE) \ - -I$(SRCDIR)/vcl/inc \ + -I$(realpath $(SRCDIR)/vcl/inc) \ )) $(eval $(call gb_SrsTarget_add_files,vcl/source/src,\ diff --git a/vcl/Library_desktop_detector.mk b/vcl/Library_desktop_detector.mk index 7963b1cfe5d5..c36f9e85518d 100644 --- a/vcl/Library_desktop_detector.mk +++ b/vcl/Library_desktop_detector.mk @@ -33,8 +33,8 @@ $(eval $(call gb_Library_add_precompiled_header,desktop_detector,$(SRCDIR)/vcl/i $(eval $(call gb_Library_set_include,desktop_detector,\ $$(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 \ 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 \ diff --git a/vcl/StaticLibrary_vclmain.mk b/vcl/StaticLibrary_vclmain.mk index cc38a2772d0f..044ce10ca40c 100755 --- a/vcl/StaticLibrary_vclmain.mk +++ b/vcl/StaticLibrary_vclmain.mk @@ -29,8 +29,8 @@ $(eval $(call gb_StaticLibrary_StaticLibrary,vclmain)) $(eval $(call gb_StaticLibrary_set_include,vclmain,\ $$(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 \ diff --git a/vcl/WinResTarget_vcl.mk b/vcl/WinResTarget_vcl.mk index 68fe30c0826c..a878f43bbd0e 100755 --- a/vcl/WinResTarget_vcl.mk +++ b/vcl/WinResTarget_vcl.mk @@ -29,7 +29,7 @@ $(eval $(call gb_WinResTarget_WinResTarget,vcl/src)) $(eval $(call gb_WinResTarget_set_include,vcl/src,\ $$(INCLUDE) \ - -I$(SRCDIR)/vcl/inc \ + -I$(realpath $(SRCDIR)/vcl/inc) \ )) $(eval $(call gb_WinResTarget_add_file,vcl/src,\ |