diff options
Diffstat (limited to 'make')
| -rw-r--r-- | make/build-jogl.xml | 12 | ||||
| -rw-r--r-- | make/build-nativewindow.xml | 8 | ||||
| -rw-r--r-- | make/build-newt.xml | 12 | ||||
| -rw-r--r-- | make/build.xml | 2 | ||||
| -rw-r--r-- | make/config/nativewindow/x11-lib.cfg | 1 | ||||
| -rwxr-xr-x | make/scripts/java-run-all.sh | 6 | ||||
| -rw-r--r-- | make/stub_includes/x11/window-lib.c | 7 |
7 files changed, 31 insertions, 17 deletions
diff --git a/make/build-jogl.xml b/make/build-jogl.xml index 27ec68718..0dd04ccb8 100644 --- a/make/build-jogl.xml +++ b/make/build-jogl.xml @@ -1104,9 +1104,9 @@ <!-- linker configuration --> <linker id="linker.cfg.linux.jogl.gl2" extends="linker.cfg.linux"> - <syslibset dir="/usr/lib" libs="X11"/> - <syslibset dir="/usr/lib" libs="Xxf86vm" /> - <syslibset dir="/usr/lib" libs="GL"/> + <syslibset libs="X11"/> + <syslibset libs="Xxf86vm" /> + <syslibset libs="GL"/> </linker> <linker id="linker.cfg.linux.jogl.cg" extends="linker.cfg.linux.jogl.gl2"> @@ -1114,12 +1114,12 @@ </linker> <linker id="linker.cfg.linux.amd64.jogl.x11" extends="linker.cfg.linux.amd64"> - <syslibset dir="/usr/lib64" libs="X11"/> - <syslibset dir="/usr/lib64" libs="Xxf86vm" /> + <syslibset libs="X11"/> + <syslibset libs="Xxf86vm" /> </linker> <linker id="linker.cfg.linux.amd64.jogl.gl2" extends="linker.cfg.linux.amd64.jogl.x11"> - <syslibset dir="/usr/lib64" libs="GL"/> + <syslibset 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 ee6eef03e..b087a5ba7 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/lib" libs="X11"/> - <syslibset dir="/usr/lib" libs="Xxf86vm" /> + <syslibset libs="X11"/> + <syslibset libs="Xxf86vm" /> </linker> <linker id="linker.cfg.linux.amd64.nativewindow.x11" extends="linker.cfg.linux.amd64"> - <syslibset dir="/usr/lib64" libs="X11"/> - <syslibset dir="/usr/lib64" libs="Xxf86vm" /> + <syslibset libs="X11"/> + <syslibset 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 01fb40ac8..08c0f308b 100644 --- a/make/build-newt.xml +++ b/make/build-newt.xml @@ -240,18 +240,18 @@ <!-- linker configuration --> <linker id="linker.cfg.linux.newt.broadcom_egl" extends="linker.cfg.linux"> - <syslibset dir="/nfsroot/lg/lib" libs="EGL"/> - <syslibset dir="/nfsroot/lg/lib" libs="GLES_CM"/> + <syslibset libs="EGL"/> + <syslibset libs="GLES_CM"/> </linker> <linker id="linker.cfg.linux.newt.x11" extends="linker.cfg.linux"> - <syslibset dir="/usr/lib" libs="X11"/> - <syslibset dir="/usr/lib" libs="Xxf86vm" /> + <syslibset libs="X11"/> + <syslibset libs="Xxf86vm" /> </linker> <linker id="linker.cfg.linux.amd64.newt.x11" extends="linker.cfg.linux.amd64"> - <syslibset dir="/usr/lib64" libs="X11"/> - <syslibset dir="/usr/lib64" libs="Xxf86vm" /> + <syslibset libs="X11"/> + <syslibset libs="Xxf86vm" /> </linker> <linker id="linker.cfg.solaris.newt.x11" extends="linker.cfg.solaris"> diff --git a/make/build.xml b/make/build.xml index 51dac3fa7..9a1cf81ce 100644 --- a/make/build.xml +++ b/make/build.xml @@ -63,6 +63,8 @@ </copy> </target> + <target name="one.dir" depends="one-lib-dir,one-jar-dir"/> + <target name="repack-jars" depends="one-jar-dir"> <!-- Re-pack jars we have the intent to compress later, after signing --> <mkdir dir="${jar}/orig" /> diff --git a/make/config/nativewindow/x11-lib.cfg b/make/config/nativewindow/x11-lib.cfg index cf9642398..2380f07ad 100644 --- a/make/config/nativewindow/x11-lib.cfg +++ b/make/config/nativewindow/x11-lib.cfg @@ -24,6 +24,7 @@ IncludeAs CustomJavaCode X11Lib x11-CustomJavaCode.java # Now resides in x11/Xmisc.c: IncludeAs CustomCCode x11-CustomCCode.c ArgumentIsString XOpenDisplay 0 +ReturnsString XDisplayString # We have Custom code for the following Ignore XGetVisualInfo diff --git a/make/scripts/java-run-all.sh b/make/scripts/java-run-all.sh index 9c3fbed03..8c50d0933 100755 --- a/make/scripts/java-run-all.sh +++ b/make/scripts/java-run-all.sh @@ -36,7 +36,11 @@ uname -a | grep -i Darwin && MOSX=1 # D_ARGS="-Dnativewindow.debug.X11Util=true -Djogl.debug.GLDrawableFactory=true" # D_ARGS="-Dnativewindow.debug.X11Util=true" # D_ARGS="-Dnewt.debug=all" +# D_ARGS="-Dnewt.debug.Window" # D_ARGS="-Djogl.debug=all" -echo java $X_ARGS $D_ARGS $* 2>&1 | tee java-run.log +rm -f java-run.log + +echo LIBXCB_ALLOW_SLOPPY_LOCK: $LIBXCB_ALLOW_SLOPPY_LOCK 2>&1 | tee -a java-run.log +echo java $X_ARGS $D_ARGS $* 2>&1 | tee -a java-run.log java $X_ARGS $D_ARGS $* 2>&1 | tee -a java-run.log diff --git a/make/stub_includes/x11/window-lib.c b/make/stub_includes/x11/window-lib.c index 8fca86263..9affa8427 100644 --- a/make/stub_includes/x11/window-lib.c +++ b/make/stub_includes/x11/window-lib.c @@ -7,6 +7,13 @@ #define _Xconst const #endif /* _Xconst */ +extern Bool XSynchronize(Display *display, Bool onoff); + +extern int XFlush(Display *display); +extern int XSync(Display *display, Bool discard); + +extern char *XDisplayString(Display *display); + extern Display *XOpenDisplay( _Xconst char* /* display_name */ ); |