diff options
| author | Sven Gothel <[email protected]> | 2012-05-04 07:02:49 +0200 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2012-05-04 07:02:49 +0200 |
| commit | de42f22c9a2b62115eb3d9d5be7451ec5bb674be (patch) | |
| tree | 6c1113043824716b08a8e86a52ca00b5e737014e /make | |
| parent | 2e0961ad8f2de321461986c65346b67b41fd7214 (diff) | |
Android: 'android.jar' -> android-015.jar', 'android-min.jar' (9); version.code: 4
Diffstat (limited to 'make')
| -rw-r--r-- | make/build.xml | 6 | ||||
| -rwxr-xr-x | make/gluegen-properties.xml | 5 |
2 files changed, 6 insertions, 5 deletions
diff --git a/make/build.xml b/make/build.xml index fb2dced..96d45bf 100644 --- a/make/build.xml +++ b/make/build.xml @@ -71,7 +71,7 @@ <property name="gluegen.build.commit" value="manual"/> <!-- fallback --> <!-- This is the version of GlueGen you are building --> - <property name="gluegen_int_version" value="3"/> + <property name="gluegen_int_version" value="4"/> <property name="gluegen_base_version" value="2.0"/> <property name="gluegen.version" value="${gluegen_base_version}-b${gluegen.build.number}-${version.timestamp}" /> <property name="gluegen.version.plus" value="${gluegen_base_version}-${gluegen.build.branch}-b${gluegen.build.number}-${version.timestamp}" /> @@ -105,14 +105,14 @@ <!-- Create the classpath for compiling Android only stuff. --> <path id="android.classpath"> - <pathelement location="${android.jar}"/> + <pathelement location="${android-min.jar}"/> </path> <!-- Create the classpath for compiling GlueGen. This requires the user-defined "antlr.jar" property. --> <path id="gluegencompile.classpath"> <pathelement location="${antlr.jar}" /> - <pathelement location="${android.jar}"/> + <pathelement location="${android-min.jar}"/> </path> <!-- Create the classpath for using GlueGen. --> diff --git a/make/gluegen-properties.xml b/make/gluegen-properties.xml index 48d348d..1276e08 100755 --- a/make/gluegen-properties.xml +++ b/make/gluegen-properties.xml @@ -45,8 +45,9 @@ <property name="ant-junit.jar" value="${ant.home}/lib/ant-junit.jar" /> <property name="android.version" value="9" /> <!-- default - if not set by jogamp-env.xml:jogamp.env.init --> - <!--property name="android.jar" value="${gluegen.root}/make/lib/android-sdk/${android.version}/android.jar" /--> - <property name="android.jar" value="${gluegen.root}/make/lib/android-sdk/15/android.jar" /> + <property name="android-min.jar" value="${gluegen.root}/make/lib/android-sdk/${android.version}/android.jar" /> + <property name="android-015.jar" value="${gluegen.root}/make/lib/android-sdk/15/android.jar" /> + <property name="android.jar" value="${android-015.jar}" /> <property name="ant-junit-all.apk" value="${gluegen.root}/make/lib/ant-junit-all.apk" /> <condition property="win32.c.compiler" value="mingw64"> |