diff options
| author | Dirk Voelzke <dv@openoffice.org> | 2010-11-08 14:17:59 +0100 |
|---|---|---|
| committer | Dirk Voelzke <dv@openoffice.org> | 2010-11-08 14:17:59 +0100 |
| commit | cd93639ae657edf1695f738e6acfac08dfcf9073 (patch) | |
| tree | 02b72a5dd655927dd39c5955884c83afe4fd15a6 /solenv/inc | |
| parent | 116c20c746e6afccbfc0a25c81b9ac10db394454 (diff) | |
dv22:#i112913# fix build problems caused by newly introduced environment changes
Diffstat (limited to 'solenv/inc')
| -rw-r--r-- | solenv/inc/settings.mk | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/solenv/inc/settings.mk b/solenv/inc/settings.mk index 41cbcbd5624b..5f3c6bf3f76d 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) @@ -602,18 +608,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)# > $@ -.INCLUDE : $(OUT)/inc/myworld.mk +.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)# > $@ -.INCLUDE : $(LOCAL_COMMON_OUT)/inc/myworld.mk +.INCLUDE : $(posix_PWD)/$(LOCAL_COMMON_OUT)/inc/myworld.mk .ENDIF # "$(common_build)"!="" .INCLUDE .IGNORE : office.mk |