diff --git a/README.md b/README.md index 221226406..ef9dc6831 100644 --- a/README.md +++ b/README.md @@ -15,6 +15,13 @@ Compilation LWJGL requires a JDK and Ant installed to compile, as well as your platforms native compiler to compile the JNI. +To build all: + +* ant all + +Or for finer control on what's done: + * ant generate-all * ant compile * ant compile_native +* ant jars diff --git a/platform_build/build-generator.xml b/platform_build/build-generator.xml index 538a65cc2..03efc794e 100644 --- a/platform_build/build-generator.xml +++ b/platform_build/build-generator.xml @@ -17,6 +17,7 @@ + diff --git a/src/java/org/lwjgl/opengl/XRandR.java b/src/java/org/lwjgl/opengl/XRandR.java index 6630f972d..04a799114 100644 --- a/src/java/org/lwjgl/opengl/XRandR.java +++ b/src/java/org/lwjgl/opengl/XRandR.java @@ -259,7 +259,7 @@ public static Screen[] getResolutions(String name) { } private static final Pattern SCREEN_HEADER_PATTERN = Pattern.compile("^(\\d+)x(\\d+)[+](\\d+)[+](\\d+)$"); - private static final Pattern SCREEN_MODELINE_PATTERN = Pattern.compile("^(\\d+)x(\\d+)$"); + private static final Pattern SCREEN_MODELINE_PATTERN = Pattern.compile("^(\\d+)x(\\d+)(_[0-9.]+)?$"); private static final Pattern FREQ_PATTERN = Pattern.compile("^(\\d+)[.](\\d+)(?:\\s*[*])?(?:\\s*[+])?$"); /**