diff options
| author | Kenneth Russel <[email protected]> | 2004-04-10 00:05:06 +0000 |
|---|---|---|
| committer | Kenneth Russel <[email protected]> | 2004-04-10 00:05:06 +0000 |
| commit | 0590053773825f33f52ffb3f322306791fa9d7b3 (patch) | |
| tree | 88004c9cb224b35eeec6b5f4f513fb74e30ea55a | |
| parent | 20dfe1a11592fc19e866aeab15c964d3e7545ebb (diff) | |
Fixed run-time problems with new visual selection code
git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/branches/jogl-1-1-temp-branch@102 232f8b59-042b-4e1e-8c03-345bb8c30851
| -rw-r--r-- | make/build.xml | 4 | ||||
| -rw-r--r-- | src/net/java/games/jogl/impl/x11/X11GLContextFactory.java | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/make/build.xml b/make/build.xml index 978ab1b9e..1f5adac14 100644 --- a/make/build.xml +++ b/make/build.xml @@ -355,7 +355,7 @@ <property name="c.compiler.includes" value="-I"make/stub_includes/opengl" -I"${java.includes.dir}" -I"${java.includes.dir.platform}" -I"make/stub_includes/cg"" /> <property name="c.linker" value="gcc" /> <property name="c.linker.flags" value="-shared" /> - <property name="c.linker.jogl.libs" value="-L"${java.lib.dir.platform}" -ljawt -lGL -lGLU" /> + <property name="c.linker.jogl.libs" value="-L"${java.lib.dir.platform}" -ljawt -lGL -lGLU -lX11" /> <property name="rootrel.c.linker.jogl.dso" value="${rootrel.obj}/libjogl.so" /> <property name="c.linker.jogl.dso" value="${project.root}/${rootrel.c.linker.jogl.dso}" /> <property name="c.linker.jogl.flags" value="-o ${c.linker.jogl.dso}" /> @@ -380,7 +380,7 @@ <property name="c.compiler.includes" value="-I"make/stub_includes/opengl" -I"${java.includes.dir}" -I"${java.includes.dir.platform}"" /> <property name="c.linker" value="cc" /> <property name="c.linker.flags" value="-G" /> - <property name="c.linker.jogl.libs" value="-L"${java.lib.dir.platform}" -ljawt -lGL -lGLU" /> + <property name="c.linker.jogl.libs" value="-L"${java.lib.dir.platform}" -ljawt -lGL -lGLU -lX11" /> <property name="rootrel.c.linker.jogl.dso" value="${rootrel.obj}/libjogl.so" /> <property name="c.linker.jogl.dso" value="${project.root}/${rootrel.c.linker.jogl.dso}" /> <property name="c.linker.jogl.flags" value="-o ${c.linker.jogl.dso}" /> diff --git a/src/net/java/games/jogl/impl/x11/X11GLContextFactory.java b/src/net/java/games/jogl/impl/x11/X11GLContextFactory.java index 2634b7aa8..817a41017 100644 --- a/src/net/java/games/jogl/impl/x11/X11GLContextFactory.java +++ b/src/net/java/games/jogl/impl/x11/X11GLContextFactory.java @@ -46,6 +46,10 @@ import net.java.games.jogl.*; import net.java.games.jogl.impl.*; public class X11GLContextFactory extends GLContextFactory { + static { + NativeLibLoader.load(); + } + public GraphicsConfiguration chooseGraphicsConfiguration(GLCapabilities capabilities, GLCapabilitiesChooser chooser, GraphicsDevice device) { |