diff options
| author | Sven Gothel <[email protected]> | 2019-04-08 04:08:26 +0200 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2019-04-08 04:08:26 +0200 |
| commit | b846476786a776296a5c5ab6cbfb370a4c5497ae (patch) | |
| tree | a9a10eacd26bae743a5d39d688c1f2bd99555514 /make | |
| parent | 0bd5136c2df8407cea7b0dcc7fb1e62432ba18bb (diff) | |
Complete jogamp-env.xml TARGET_* readout; Use parsed env in cpptasks-base as well
Diffstat (limited to 'make')
| -rwxr-xr-x | make/gluegen-cpptasks-base.xml | 4 | ||||
| -rwxr-xr-x | make/jogamp-env.xml | 12 |
2 files changed, 14 insertions, 2 deletions
diff --git a/make/gluegen-cpptasks-base.xml b/make/gluegen-cpptasks-base.xml index 0f44566..adf8ab6 100755 --- a/make/gluegen-cpptasks-base.xml +++ b/make/gluegen-cpptasks-base.xml @@ -1441,8 +1441,8 @@ --> <target name="gluegen.cpptasks.declare.compiler.environment" > <condition property="java.lib.dir.platform" - value="${env.TARGET_JAVA_LIBS}" > - <available file="${env.TARGET_JAVA_LIBS}" type="dir" /> + value="${TARGET_JAVA_LIBS}" > + <available file="${TARGET_JAVA_LIBS}" type="dir" /> </condition> </target> diff --git a/make/jogamp-env.xml b/make/jogamp-env.xml index 95d277e..9e22cbe 100755 --- a/make/jogamp-env.xml +++ b/make/jogamp-env.xml @@ -299,8 +299,20 @@ <equals arg1="${env.TARGET_PLATFORM_USRROOT}" arg2="$${env.TARGET_PLATFORM_USRROOT}" casesensitive="true" /> </not> </condition> + <condition property="TARGET_PLATFORM_USRLIBS" value="${env.TARGET_PLATFORM_USRLIBS}"> + <not> + <equals arg1="${env.TARGET_PLATFORM_USRLIBS}" arg2="$${env.TARGET_PLATFORM_USRLIBS}" casesensitive="true" /> + </not> + </condition> + <condition property="TARGET_JAVA_LIBS" value="${env.TARGET_JAVA_LIBS}"> + <not> + <equals arg1="${env.TARGET_JAVA_LIBS}" arg2="$${env.TARGET_JAVA_LIBS}" casesensitive="true" /> + </not> + </condition> <echo message='TARGET_PLATFORM_SYSROOT ${TARGET_PLATFORM_SYSROOT}'/> <echo message='TARGET_PLATFORM_USRROOT ${TARGET_PLATFORM_USRROOT}'/> + <echo message='TARGET_PLATFORM_USRLIBS ${TARGET_PLATFORM_USRLIBS}'/> + <echo message='TARGET_JAVA_LIBS ${TARGET_JAVA_LIBS}'/> </target> </project> |