diff options
| author | Sven Gothel <[email protected]> | 2014-07-03 16:52:39 +0200 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2014-07-03 16:52:39 +0200 |
| commit | 043a9f751ab24e1c50a333d97a7f8f78e5e2a7a1 (patch) | |
| tree | e373a491dd5758da23f5a0377a53216674e41e00 | |
| parent | 556d92b63555a085b25e32b1cd55afce24edd07a (diff) | |
Bug 1021: Fix remaining build issues if sub-module oculusvr-sdk is missing
| -rw-r--r-- | make/build-test.xml | 1 | ||||
| -rw-r--r-- | make/build.xml | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/make/build-test.xml b/make/build-test.xml index daa5e563d..88d40bc39 100644 --- a/make/build-test.xml +++ b/make/build-test.xml @@ -123,6 +123,7 @@ <target name="test.compile.android" if="android-jars.available"> <!-- Perform the junit pass Java Android compile --> <javac destdir="${classes}" + excludes="${java.part.test.oculusvr}" fork="yes" includeAntRuntime="false" memoryMaximumSize="${javac.memorymax}" diff --git a/make/build.xml b/make/build.xml index 6346a26f4..cadf0248c 100644 --- a/make/build.xml +++ b/make/build.xml @@ -247,6 +247,7 @@ <!--delete includeEmptyDirs="true" quiet="true" failonerror="false"> <fileset dir="${build}" includes="jogl-java-src.zip" /> </delete--> + <mkdir dir="${build}/oculusvr/gensrc/classes"/> <!-- just in case it was _not_ build --> <zip destfile="${build}/jogl-java-src.zip" level="0"> <fileset dir="${src}/nativewindow/classes"/> <fileset dir="${build}/nativewindow/gensrc/classes"/> |