From 3208236305f7c24fce556fda10eeb9905779a37c Mon Sep 17 00:00:00 2001 From: Vasily Melenchuk Date: Tue, 15 Oct 2019 15:07:10 +0300 Subject: odk: fix for change directory in complextoolbarcontrols sample On Windows classical "cd" command does not change drive automatically. So if OO_SDK_OUT folder located on another drive than SDK_HOME we will receive confusing buid errors. To avoid this for Windows configuration we should use "cd /d". Change-Id: I22908d49fc915d3a834972357934349ba82bbec5 Reviewed-on: https://gerrit.libreoffice.org/80827 Tested-by: Jenkins Reviewed-by: Thorsten Behrens --- odk/settings/settings.mk | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'odk/settings') diff --git a/odk/settings/settings.mk b/odk/settings/settings.mk index 7998410704bd..25e5cb4af4b4 100644 --- a/odk/settings/settings.mk +++ b/odk/settings/settings.mk @@ -59,6 +59,7 @@ CAT=type OBJ_EXT=obj EXE_EXT=.exe COPY=copy +CD=cd /d SHAREDLIB_EXT=dll SHAREDLIB_OUT=$(OUT_BIN) UNOPKG_PLATFORM=Windows @@ -190,6 +191,7 @@ P2BG=& DEL=rm -f DELRECURSIVE=rm -rf COPY=cp +CD=cd URLPREFIX=file:// COMID=gcc3 @@ -333,6 +335,7 @@ P2BG=& DEL=rm -f DELRECURSIVE=rm -rf COPY=cp +CD=cd URLPREFIX=file:// SALLIB=-luno_sal @@ -432,6 +435,7 @@ P2BG=& DEL=rm -f DELRECURSIVE=rm -rf COPY=cp +CD=cd URLPREFIX=file:// SALLIB=-luno_sal @@ -542,6 +546,7 @@ P2BG=& DEL=rm -f DELRECURSIVE=rm -rf COPY=cp +CD=cd URLPREFIX=file:// SALLIB=-luno_sal -- cgit