summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTor Lillqvist <tlillqvist@novell.com>2011-03-17 13:35:16 +0200
committerTor Lillqvist <tlillqvist@novell.com>2011-03-17 13:35:16 +0200
commitf2f00bd3752c1dc3a3e47099bd81bc2057577b0d (patch)
tree51d777e757b7e3ad037ac53d738dce6460563c69
parent02dcdeb3d995f77beb2d03c51a7d5a705dd523e5 (diff)
Use realpath to unbreak compilation for Windows
-rwxr-xr-xframework/AllLangResTarget_fwe.mk8
-rwxr-xr-xframework/Library_fwe.mk6
-rwxr-xr-xframework/Library_fwi.mk6
-rwxr-xr-xframework/Library_fwk.mk6
-rwxr-xr-xframework/Library_fwl.mk6
5 files changed, 16 insertions, 16 deletions
diff --git a/framework/AllLangResTarget_fwe.mk b/framework/AllLangResTarget_fwe.mk
index 10baea76a9..2bf8ccb8a7 100755
--- a/framework/AllLangResTarget_fwe.mk
+++ b/framework/AllLangResTarget_fwe.mk
@@ -39,8 +39,8 @@ $(eval $(call gb_SrsTarget_SrsTarget,fwe/fwk_classes))
$(eval $(call gb_SrsTarget_set_include,fwe/fwk_classes,\
$$(INCLUDE) \
- -I$(SRCDIR)/framework/inc \
- -I$(SRCDIR)/framework/inc/classes \
+ -I$(realpath $(SRCDIR)/framework/inc) \
+ -I$(realpath $(SRCDIR)/framework/inc/classes) \
-I$(OUTDIR)/inc \
))
@@ -52,8 +52,8 @@ $(eval $(call gb_SrsTarget_SrsTarget,fwe/fwk_services))
$(eval $(call gb_SrsTarget_set_include,fwe/fwk_services,\
$$(INCLUDE) \
- -I$(SRCDIR)/framework/inc \
- -I$(SRCDIR)/framework/inc/services \
+ -I$(realpath $(SRCDIR)/framework/inc) \
+ -I$(realpath $(SRCDIR)/framework/inc/services) \
-I$(OUTDIR)/inc \
))
diff --git a/framework/Library_fwe.mk b/framework/Library_fwe.mk
index 1c9271192f..af5d111a8c 100755
--- a/framework/Library_fwe.mk
+++ b/framework/Library_fwe.mk
@@ -28,9 +28,9 @@
$(eval $(call gb_Library_Library,fwe))
$(eval $(call gb_Library_set_include,fwe,\
- -I$(SRCDIR)/framework/inc/pch \
- -I$(SRCDIR)/framework/source/inc \
- -I$(SRCDIR)/framework/inc \
+ -I$(realpath $(SRCDIR)/framework/inc/pch) \
+ -I$(realpath $(SRCDIR)/framework/source/inc) \
+ -I$(realpath $(SRCDIR)/framework/inc) \
-I$(WORKDIR)/inc/framework/ \
$$(INCLUDE) \
-I$(OUTDIR)/inc/framework \
diff --git a/framework/Library_fwi.mk b/framework/Library_fwi.mk
index 1d4bb80b62..f8d3db955a 100755
--- a/framework/Library_fwi.mk
+++ b/framework/Library_fwi.mk
@@ -35,9 +35,9 @@ $(eval $(call gb_Library_set_defs,fwi,\
))
$(eval $(call gb_Library_set_include,fwi,\
- -I$(SRCDIR)/framework/inc/pch \
- -I$(SRCDIR)/framework/source/inc \
- -I$(SRCDIR)/framework/inc \
+ -I$(realpath $(SRCDIR)/framework/inc/pch) \
+ -I$(realpath $(SRCDIR)/framework/source/inc) \
+ -I$(realpath $(SRCDIR)/framework/inc) \
-I$(WORKDIR)/inc/framework/ \
$$(INCLUDE) \
-I$(OUTDIR)/inc/framework \
diff --git a/framework/Library_fwk.mk b/framework/Library_fwk.mk
index a34a1bc597..5e7dcac6e6 100755
--- a/framework/Library_fwk.mk
+++ b/framework/Library_fwk.mk
@@ -32,9 +32,9 @@ $(eval $(call gb_Library_add_precompiled_header,fwk,$(SRCDIR)/framework/inc/pch/
$(eval $(call gb_Library_set_componentfile,fwk,framework/util/fwk))
$(eval $(call gb_Library_set_include,fwk,\
- -I$(SRCDIR)/framework/inc/pch \
- -I$(SRCDIR)/framework/source/inc \
- -I$(SRCDIR)/framework/inc \
+ -I$(realpath $(SRCDIR)/framework/inc/pch) \
+ -I$(realpath $(SRCDIR)/framework/source/inc) \
+ -I$(realpath $(SRCDIR)/framework/inc) \
-I$(WORKDIR)/inc/framework/ \
$$(INCLUDE) \
-I$(OUTDIR)/inc/framework \
diff --git a/framework/Library_fwl.mk b/framework/Library_fwl.mk
index 928c723d3f..5f9799d2fc 100755
--- a/framework/Library_fwl.mk
+++ b/framework/Library_fwl.mk
@@ -30,9 +30,9 @@ $(eval $(call gb_Library_Library,fwl))
$(eval $(call gb_Library_set_componentfile,fwl,framework/util/fwl))
$(eval $(call gb_Library_set_include,fwl,\
- -I$(SRCDIR)/framework/inc \
- -I$(SRCDIR)/framework/inc/pch \
- -I$(SRCDIR)/framework/source/inc \
+ -I$(realpath $(SRCDIR)/framework/inc) \
+ -I$(realpath $(SRCDIR)/framework/inc/pch) \
+ -I$(realpath $(SRCDIR)/framework/source/inc) \
-I$(WORKDIR)/inc/framework/ \
$$(INCLUDE) \
-I$(OUTDIR)/inc/framework \