diff options
| author | Kenneth Russel <[email protected]> | 2003-07-14 06:02:58 +0000 |
|---|---|---|
| committer | Kenneth Russel <[email protected]> | 2003-07-14 06:02:58 +0000 |
| commit | 4d5b904f347052144e417aa182243f3abe676de7 (patch) | |
| tree | be26b623921bca3d68eca4becc387293877d167a | |
| parent | 32350278dd07c95bec7e8adcf19ca1601dd6c6b4 (diff) | |
Fixed bugs in Linux build: GLEmitter needs to be used for
window-system.c, JRE library path was wrong.
git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/trunk@20 232f8b59-042b-4e1e-8c03-345bb8c30851
| -rw-r--r-- | make/build.xml | 6 | ||||
| -rw-r--r-- | make/host.properties | 5 |
2 files changed, 8 insertions, 3 deletions
diff --git a/make/build.xml b/make/build.xml index 3b225737e..ad761b54a 100644 --- a/make/build.xml +++ b/make/build.xml @@ -179,8 +179,8 @@ <property name="java.includes.dir.solaris" value="${java.includes.dir}/solaris" /> <property name="java.includes.dir.macosx" value="/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK/Headers" /> <property name="java.lib.dir.win32" value="${java.home.dir}/lib" /> - <property name="java.lib.dir.linux" value="${java.home.dir}/lib/i386" /> - <property name="java.lib.dir.solaris" value="${java.home.dir}/${os.arch}" /> + <property name="java.lib.dir.linux" value="${java.home.dir}/jre/lib/i386" /> + <property name="java.lib.dir.solaris" value="${java.home.dir}/jre/lib/${os.arch}" /> <property name="java.lib.dir.macosx" value="/System/Library/Frameworks/JavaVM.framework/Libraries" /> <property name="gl.headers" value="${stub.includes.dir}/opengl/**/*.h" /> <!-- NOTE: this MUST be relative for FileSet --> <!-- CHECK: this may need to be pruned for each platform --> @@ -562,7 +562,7 @@ <gluegen src="${stub.includes.platform}/window-system.c" config="${window.cfg}" includeRefid="stub.includes.fileset.platform" - emitter="net.java.games.gluegen.JavaEmitter"> + emitter="net.java.games.gluegen.opengl.GLEmitter"> <classpath refid="gen.classpath" /> </gluegen> diff --git a/make/host.properties b/make/host.properties index 81316c556..b88cd68ca 100644 --- a/make/host.properties +++ b/make/host.properties @@ -15,7 +15,12 @@ # The required antlr.jar property that is the full path to the antlr.jar # including the name of the jar # +# Windows antlr.jar=C:/Users/kbr/ANTLR/antlr-2.7.2/antlr.jar +# Linux +# antlr.jar=/home/kbr/antlr-2.7.2/antlr.jar +# Mac OS X +# antlr.jar=/Users/kbr/antlr-2.7.2/antlr.jar # # Force the use of jikes in +E (emacs) mode |