diff options
Diffstat (limited to 'make')
| -rw-r--r-- | make/build-common.xml | 8 | ||||
| -rw-r--r-- | make/build.xml | 2 |
2 files changed, 9 insertions, 1 deletions
diff --git a/make/build-common.xml b/make/build-common.xml index 03372ccf5..d0c1156ae 100644 --- a/make/build-common.xml +++ b/make/build-common.xml @@ -266,7 +266,15 @@ <condition property="oculusvr.sdk.available"> <available file="${rel.oculusvr.sdk}/LibOVR/Include/OVR_CAPI.h"/> </condition> + <condition property="setup.do_oculusvr"> + <and> + <istrue value="${oculusvr.sdk.available}" /> + <istrue value="${oculusvr.enabled}" /> + </and> + </condition> <echo message="oculusvr.sdk.available: ${oculusvr.sdk.available}" /> + <echo message="oculusvr.enabled: ${oculusvr.enabled}" /> + <echo message="setup.do_oculusvr: ${setup.do_oculusvr}" /> <property name="graphui.make" value="." /> <property name="graphui.build.xml" value="${graphui.make}/build-graphui.xml" /> diff --git a/make/build.xml b/make/build.xml index 44ede60b9..d9b2dab63 100644 --- a/make/build.xml +++ b/make/build.xml @@ -88,7 +88,7 @@ <ant antfile="${graphui.build.xml}" dir="${graphui.make}" target="all" inheritRefs="true" inheritAll="true"/> </target> - <target name="build.oculusvr" depends="init" if="oculusvr.sdk.available"> + <target name="build.oculusvr" depends="init" if="setup.do_oculusvr"> <ant antfile="${oculusvr.build.xml}" dir="${oculusvr.make}" target="all" inheritRefs="true" inheritAll="true"/> </target> |