strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Attempt to fix vcl build on Windows

Browse source
This commit is contained in:
Tor Lillqvist 2011-05-28 22:38:33 +03:00
parent 845c261d8c
commit 9ff135581c
5 changed files with 9 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
vcl/AllLangResTarget_vcl.mk
View file

@ -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,\

4
vcl/Library_desktop_detector.mk
View file

@ -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 \

13
vcl/Library_vcl.mk
View file

@ -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 \

4
vcl/StaticLibrary_vclmain.mk
View file

@ -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 \

2
vcl/WinResTarget_vcl.mk
View file

@ -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,\