diff options
| author | Hans-Joachim Lankenau <hjs@openoffice.org> | 2010-12-17 16:42:38 +0100 |
|---|---|---|
| committer | Hans-Joachim Lankenau <hjs@openoffice.org> | 2010-12-17 16:42:38 +0100 |
| commit | feb2126d136d9ee469a5b9431993f622fb5040ff (patch) | |
| tree | 9f36dee5e42e75a912ab815228e02bfe24a45728 /solenv/inc/settings.mk | |
| parent | b956608c5f51ee7f4bbc765645b4076fde3d627e (diff) | |
| parent | cd93639ae657edf1695f738e6acfac08dfcf9073 (diff) | |
CWS-TOOLING: integrate CWS dv22
Diffstat (limited to 'solenv/inc/settings.mk')
| -rw-r--r-- | solenv/inc/settings.mk | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/solenv/inc/settings.mk b/solenv/inc/settings.mk index 01e412ec5381..a4b02a9ed164 100644 --- a/solenv/inc/settings.mk +++ b/solenv/inc/settings.mk @@ -299,6 +299,12 @@ dbgutil= # --------------------------------------------------------------------------- DMAKE_WORK_DIR*:=$(subst,/,/ $(PWD)) +.IF "$(GUI)"=="WNT" +posix_PWD:=/cygdrive/$(PWD:s/://) +.ELSE #GUI)"=="WNT" +posix_PWD:=$(PWD) +.ENDIF #GUI)"=="WNT" + .IF "$(TMP)"!="" tmp*=$(TMP) @@ -604,23 +610,18 @@ LOCAL_COMMON_OUT:=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(OUT)) # As this is not part of the initial startup makefile we define an infered # target instead of using $(OUT)/inc/myworld.mk as target name. # (See iz62795) -$(OUT)/inc/%world.mk : +$(posix_PWD)/$(OUT)/inc/%world.mk : @$(MKOUT) $(ROUT) @echo $(EMQ)# > $@ -# don't need/want output trees in solenv!!! -.IF "$(PRJNAME)"!="solenv" -.INCLUDE : $(OUT)/inc/myworld.mk -.ENDIF # "$(PRJNAME)"!="solenv" +.INCLUDE : $(posix_PWD)/$(OUT)/inc/myworld.mk .IF "$(common_build)"!="" -$(LOCAL_COMMON_OUT)/inc/%world.mk : +$(posix_PWD)/$(LOCAL_COMMON_OUT)/inc/%world.mk : @$(MKOUT) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(ROUT)) @echo $(EMQ)# > $@ -.IF "$(PRJNAME)"!="solenv" -.INCLUDE : $(LOCAL_COMMON_OUT)/inc/myworld.mk -.ENDIF # "$(PRJNAME)"!="solenv" +.INCLUDE : $(posix_PWD)/$(LOCAL_COMMON_OUT)/inc/myworld.mk .ENDIF # "$(common_build)"!="" .INCLUDE .IGNORE : office.mk |