Kaydet (Commit) cf08cded authored tarafından Tor Lillqvist's avatar Tor Lillqvist

Use realpath to avoid -I options containing symlinks on Cygwin

üst 2e21ec52
...@@ -42,8 +42,8 @@ $(eval $(call gb_SrsTarget_set_include,svl/res,\ ...@@ -42,8 +42,8 @@ $(eval $(call gb_SrsTarget_set_include,svl/res,\
)) ))
$(eval $(call gb_SrsTarget_add_files,svl/res,\ $(eval $(call gb_SrsTarget_add_files,svl/res,\
svl/source/misc/mediatyp.src \ clone/libs-gui/svl/source/misc/mediatyp.src \
svl/source/items/cstitem.src \ clone/libs-gui/svl/source/items/cstitem.src \
)) ))
...@@ -33,10 +33,10 @@ $(eval $(call gb_Library_set_include,fsstorage,\ ...@@ -33,10 +33,10 @@ $(eval $(call gb_Library_set_include,fsstorage,\
$$(SOLARINC) \ $$(SOLARINC) \
-I$(WORKDIR)/inc/svl \ -I$(WORKDIR)/inc/svl \
-I$(WORKDIR)/inc/ \ -I$(WORKDIR)/inc/ \
-I$(SRCDIR)/svl/inc \ -I$(realpath $(SRCDIR)/svl/inc) \
-I$(SRCDIR)/svl/inc/svl \ -I$(realpath $(SRCDIR)/svl/inc/svl) \
-I$(SRCDIR)/svl/source/inc \ -I$(realpath $(SRCDIR)/svl/source/inc) \
-I$(SRCDIR)/svl/inc/pch \ -I$(realpath $(SRCDIR)/svl/inc/pch) \
-I$(OUTDIR)/inc/offuh \ -I$(OUTDIR)/inc/offuh \
-I$(OUTDIR)/inc \ -I$(OUTDIR)/inc \
)) ))
......
...@@ -33,10 +33,10 @@ $(eval $(call gb_Library_set_include,passwordcontainer,\ ...@@ -33,10 +33,10 @@ $(eval $(call gb_Library_set_include,passwordcontainer,\
$$(SOLARINC) \ $$(SOLARINC) \
-I$(WORKDIR)/inc/svl \ -I$(WORKDIR)/inc/svl \
-I$(WORKDIR)/inc/ \ -I$(WORKDIR)/inc/ \
-I$(SRCDIR)/svl/inc \ -I$(realpath $(SRCDIR)/svl/inc) \
-I$(SRCDIR)/svl/inc/svl \ -I$(realpath $(SRCDIR)/svl/inc/svl) \
-I$(SRCDIR)/svl/source/inc \ -I$(realpath $(SRCDIR)/svl/source/inc) \
-I$(SRCDIR)/svl/inc/pch \ -I$(realpath $(SRCDIR)/svl/inc/pch) \
-I$(OUTDIR)/inc/offuh \ -I$(OUTDIR)/inc/offuh \
-I$(OUTDIR)/inc \ -I$(OUTDIR)/inc \
)) ))
......
...@@ -35,8 +35,8 @@ $(eval $(call gb_Library_set_componentfile,svl,svl/util/svl)) ...@@ -35,8 +35,8 @@ $(eval $(call gb_Library_set_componentfile,svl,svl/util/svl))
$(eval $(call gb_Library_set_include,svl,\ $(eval $(call gb_Library_set_include,svl,\
$$(SOLARINC) \ $$(SOLARINC) \
-I$(SRCDIR)/svl/source/inc \ -I$(realpath $(SRCDIR)/svl/source/inc) \
-I$(SRCDIR)/svl/inc/pch \ -I$(realpath $(SRCDIR)/svl/inc/pch) \
-I$(OUTDIR)/inc/offuh \ -I$(OUTDIR)/inc/offuh \
)) ))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment