diff options
| author | Kenneth Russel <[email protected]> | 2006-02-10 20:06:04 +0000 |
|---|---|---|
| committer | Kenneth Russel <[email protected]> | 2006-02-10 20:06:04 +0000 |
| commit | 4b14f14cbb84c3d60d3fb501d78873c574eec6bd (patch) | |
| tree | 2bac953157778f18e0eff06c4c01fe08e55d9076 /make/build.xml | |
| parent | c6ed1767abe191648219a403828ecf32ad5ad25e (diff) | |
Made loading of GLU library lazier, partially in the hope that this
may address problems on certain Linux distributions where for some
reason we're falling back to software rendering with Mesa
git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/trunk@595 232f8b59-042b-4e1e-8c03-345bb8c30851
Diffstat (limited to 'make/build.xml')
| -rw-r--r-- | make/build.xml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/make/build.xml b/make/build.xml index 1e7d614f1..1f251e82d 100644 --- a/make/build.xml +++ b/make/build.xml @@ -701,19 +701,19 @@ <!-- linker configuration --> <linker id="linker.cfg.linux" name="gcc"> - <syslibset dir="/usr/X11R6/lib" libs="GL, GLU, X11"/> + <syslibset dir="/usr/X11R6/lib" libs="GL, X11"/> <syslibset dir="/usr/X11R6/lib" libs="Xxf86vm" /> <syslibset dir="${x11.cg.lib}" libs="Cg, CgGL" if="c.compiler.use-cglib"/> </linker> <linker id="linker.cfg.linux.amd64" name="gcc"> - <syslibset dir="/usr/X11R6/lib64" libs="GL, GLU, X11"/> + <syslibset dir="/usr/X11R6/lib64" libs="GL, X11"/> <syslibset dir="/usr/X11R6/lib64" libs="Xxf86vm" /> <syslibset dir="${x11.cg.lib}" libs="Cg, CgGL" if="c.compiler.use-cglib"/> </linker> <linker id="linker.cfg.solaris" name="suncc"> - <syslibset libs="GL, GLU, X11"/> + <syslibset libs="GL, X11"/> </linker> <linker id="linker.cfg.win32.mingw" name="gcc" incremental="false"> @@ -727,7 +727,7 @@ <linkerarg value="/SUBSYSTEM:WINDOWS" /> <!-- output is not a console app as uses WinMain entry point --> <linkerarg value="/MACHINE:IX86" /> <!-- explicity set target platform --> - <syslibset libs="opengl32, glu32, gdi32, user32, kernel32" /> + <syslibset libs="opengl32, gdi32, user32, kernel32" /> <syslibset dir="${windows.cg.lib}" libs="cg, cgGL" if="c.compiler.use-cglib"/> </linker> |