diff options
| author | Sven Gothel <[email protected]> | 2010-04-30 04:55:54 +0200 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2010-04-30 04:55:54 +0200 |
| commit | 888e9a2d0a00edd88660322b34108565efd103cb (patch) | |
| tree | eb78a6a3ba71bd2d4509aec3239444e1c474d4a5 | |
| parent | 9bdcb54bc88788c1c3bea1bb76955f81ed3db3f7 (diff) | |
Xorg libs/headers are in std FS location /usr
| -rw-r--r-- | make/build-jogl.xml | 12 | ||||
| -rw-r--r-- | make/build-nativewindow.xml | 8 | ||||
| -rw-r--r-- | make/build-newt.xml | 8 |
3 files changed, 14 insertions, 14 deletions
diff --git a/make/build-jogl.xml b/make/build-jogl.xml index a101f5ecb..6c0755f8e 100644 --- a/make/build-jogl.xml +++ b/make/build-jogl.xml @@ -1102,9 +1102,9 @@ <!-- linker configuration --> <linker id="linker.cfg.linux.jogl.gl2" extends="linker.cfg.linux"> - <syslibset dir="/usr/X11R6/lib" libs="X11"/> - <syslibset dir="/usr/X11R6/lib" libs="Xxf86vm" /> - <syslibset dir="/usr/X11R6/lib" libs="GL"/> + <syslibset dir="/usr/lib" libs="X11"/> + <syslibset dir="/usr/lib" libs="Xxf86vm" /> + <syslibset dir="/usr/lib" libs="GL"/> </linker> <linker id="linker.cfg.linux.jogl.cg" extends="linker.cfg.linux.jogl.gl2"> @@ -1112,12 +1112,12 @@ </linker> <linker id="linker.cfg.linux.amd64.jogl.x11" extends="linker.cfg.linux.amd64"> - <syslibset dir="/usr/X11R6/lib64" libs="X11"/> - <syslibset dir="/usr/X11R6/lib64" libs="Xxf86vm" /> + <syslibset dir="/usr/lib64" libs="X11"/> + <syslibset dir="/usr/lib64" libs="Xxf86vm" /> </linker> <linker id="linker.cfg.linux.amd64.jogl.gl2" extends="linker.cfg.linux.amd64.jogl.x11"> - <syslibset dir="/usr/X11R6/lib64" libs="GL"/> + <syslibset dir="/usr/lib64" libs="GL"/> </linker> <linker id="linker.cfg.linux.amd64.jogl.cg" extends="linker.cfg.linux.amd64.jogl.gl2"> diff --git a/make/build-nativewindow.xml b/make/build-nativewindow.xml index 0fd0af79b..ff471d111 100644 --- a/make/build-nativewindow.xml +++ b/make/build-nativewindow.xml @@ -361,13 +361,13 @@ <!-- linker configuration --> <linker id="linker.cfg.linux.nativewindow.x11" extends="linker.cfg.linux"> - <syslibset dir="/usr/X11R6/lib" libs="X11"/> - <syslibset dir="/usr/X11R6/lib" libs="Xxf86vm" /> + <syslibset dir="/usr/lib" libs="X11"/> + <syslibset dir="/usr/lib" libs="Xxf86vm" /> </linker> <linker id="linker.cfg.linux.amd64.nativewindow.x11" extends="linker.cfg.linux.amd64"> - <syslibset dir="/usr/X11R6/lib64" libs="X11"/> - <syslibset dir="/usr/X11R6/lib64" libs="Xxf86vm" /> + <syslibset dir="/usr/lib64" libs="X11"/> + <syslibset dir="/usr/lib64" libs="Xxf86vm" /> </linker> <linker id="linker.cfg.solaris.nativewindow.x11" extends="linker.cfg.solaris"> diff --git a/make/build-newt.xml b/make/build-newt.xml index 8bbfde2ae..158ec0dcd 100644 --- a/make/build-newt.xml +++ b/make/build-newt.xml @@ -245,13 +245,13 @@ </linker> <linker id="linker.cfg.linux.newt.x11" extends="linker.cfg.linux"> - <syslibset dir="/usr/X11R6/lib" libs="X11"/> - <syslibset dir="/usr/X11R6/lib" libs="Xxf86vm" /> + <syslibset dir="/usr/lib" libs="X11"/> + <syslibset dir="/usr/lib" libs="Xxf86vm" /> </linker> <linker id="linker.cfg.linux.amd64.newt.x11" extends="linker.cfg.linux.amd64"> - <syslibset dir="/usr/X11R6/lib64" libs="X11"/> - <syslibset dir="/usr/X11R6/lib64" libs="Xxf86vm" /> + <syslibset dir="/usr/lib64" libs="X11"/> + <syslibset dir="/usr/lib64" libs="Xxf86vm" /> </linker> <linker id="linker.cfg.solaris.newt.x11" extends="linker.cfg.solaris"> |