diff options
| author | Michael Bien <[email protected]> | 2009-07-24 17:23:23 +0200 |
|---|---|---|
| committer | Michael Bien <[email protected]> | 2009-07-24 17:23:23 +0200 |
| commit | a07c223b8dbde8f81886b7b2bf602e26ab9531b3 (patch) | |
| tree | effdf5260008abf87dc1059a194b15cf1ed9fdf8 | |
| parent | d68d486c15bc25a919b5e3e46da142957a40b039 (diff) | |
| parent | 53b16f758e0db510db420fabe6793e7921a9c407 (diff) | |
Merge branch 'master' of ssh://[email protected]/gluegen~gluegen-git
| -rwxr-xr-x | make/gluegen-cpptasks.xml | 3 | ||||
| -rwxr-xr-x | make/gluegen.properties | 4 |
2 files changed, 7 insertions, 0 deletions
diff --git a/make/gluegen-cpptasks.xml b/make/gluegen-cpptasks.xml index 48f6520..32cabbc 100755 --- a/make/gluegen-cpptasks.xml +++ b/make/gluegen-cpptasks.xml @@ -53,6 +53,8 @@ - isWindowsX86 - isWindowsAMD64 - isX11 + - + - isX11 is set if: !isWindows && !isOSX && !noX11 - - It also sets the following properties which are useful for - building native library jar files for Java Web Start and @@ -259,6 +261,7 @@ <and> <isfalse value="${isWindows}" /> <isfalse value="${isOSX}" /> + <isfalse value="${noX11}" /> </and> </condition> diff --git a/make/gluegen.properties b/make/gluegen.properties index c8756ea..2e110e3 100755 --- a/make/gluegen.properties +++ b/make/gluegen.properties @@ -34,4 +34,8 @@ antlr.jar=C:/Users/kbr/ANTLR/antlr-2.7.2/antlr.jar # Note: Unsupported on Snow Leopard! # macosppc=true +# isX11 is selected for a platform where: !isWindows && !isOSX. +# To avoid X11 related builds you need to set 'noX11' to true. +# noX11=true + #user.compiler.import="${user.home}/gluegen.compiler.xml" |