From 950b17a8fe2f69021a56a516c75e9b47a23cfd7c Mon Sep 17 00:00:00 2001 From: riven-lwjgl Date: Tue, 12 Jul 2011 17:49:58 +0000 Subject: [PATCH] Test case showing problems on loading library (64 vs 32 bit) --- .../test/mapped/MappedObjectWithLibrary.java | 18 ++++++++++++++++++ .../lwjgl/test/mapped/TestMappedObject.java | 4 +++- .../org/lwjgl/util/mapped/MappedObject.java | 2 +- .../util/mapped/MappedObjectTransformer.java | 4 ++-- 4 files changed, 24 insertions(+), 4 deletions(-) create mode 100644 src/java/org/lwjgl/test/mapped/MappedObjectWithLibrary.java diff --git a/src/java/org/lwjgl/test/mapped/MappedObjectWithLibrary.java b/src/java/org/lwjgl/test/mapped/MappedObjectWithLibrary.java new file mode 100644 index 00000000..e0c972be --- /dev/null +++ b/src/java/org/lwjgl/test/mapped/MappedObjectWithLibrary.java @@ -0,0 +1,18 @@ +/* + * Created on Jul 12, 2011 + */ + +package org.lwjgl.test.mapped; + +import java.io.File; + +import org.lwjgl.opengl.Display; + +public class MappedObjectWithLibrary +{ + public static void testLWJGL() throws Exception + { + System.out.println(new File(System.getProperty("java.library.path")).getCanonicalPath()); + Display.create(); + } +} diff --git a/src/java/org/lwjgl/test/mapped/TestMappedObject.java b/src/java/org/lwjgl/test/mapped/TestMappedObject.java index 83ce2345..489d8832 100644 --- a/src/java/org/lwjgl/test/mapped/TestMappedObject.java +++ b/src/java/org/lwjgl/test/mapped/TestMappedObject.java @@ -44,7 +44,7 @@ public class TestMappedObject { throw new RuntimeException("Asserts must be enabled for this test."); } - public static void main(String[] args) { + public static void main(String[] args) throws Exception { MappedObjectTransformer.register(MappedFloat.class); MappedObjectTransformer.register(MappedVec2.class); MappedObjectTransformer.register(MappedVec3.class); @@ -70,6 +70,8 @@ public class TestMappedObject { MappedObjectTests3.testForeach(); MappedObjectTests3.testConstructor(); MappedObjectTests3.testMappedSet(); + + MappedObjectWithLibrary.testLWJGL(); } } \ No newline at end of file diff --git a/src/java/org/lwjgl/util/mapped/MappedObject.java b/src/java/org/lwjgl/util/mapped/MappedObject.java index 35bc1320..6f1ad3b5 100644 --- a/src/java/org/lwjgl/util/mapped/MappedObject.java +++ b/src/java/org/lwjgl/util/mapped/MappedObject.java @@ -50,7 +50,7 @@ import java.nio.ByteBuffer; */ public class MappedObject { - static final boolean CHECKS = LWJGLUtil.getPrivilegedBoolean("org.lwjgl.util.mapped.Checks"); + static final boolean CHECKS = false;//LWJGLUtil.getPrivilegedBoolean("org.lwjgl.util.mapped.Checks"); public MappedObject() { // diff --git a/src/java/org/lwjgl/util/mapped/MappedObjectTransformer.java b/src/java/org/lwjgl/util/mapped/MappedObjectTransformer.java index b3956b5a..ad40c45c 100644 --- a/src/java/org/lwjgl/util/mapped/MappedObjectTransformer.java +++ b/src/java/org/lwjgl/util/mapped/MappedObjectTransformer.java @@ -32,8 +32,8 @@ import static org.objectweb.asm.Opcodes.*; */ public class MappedObjectTransformer { - static final boolean PRINT_TIMING = LWJGLUtil.DEBUG && LWJGLUtil.getPrivilegedBoolean("org.lwjgl.util.mapped.PrintTiming"); - static final boolean PRINT_ACTIVITY = LWJGLUtil.DEBUG && LWJGLUtil.getPrivilegedBoolean("org.lwjgl.util.mapped.PrintActivity"); + static final boolean PRINT_TIMING = false;//LWJGLUtil.DEBUG && LWJGLUtil.getPrivilegedBoolean("org.lwjgl.util.mapped.PrintTiming"); + static final boolean PRINT_ACTIVITY = false;//LWJGLUtil.DEBUG && LWJGLUtil.getPrivilegedBoolean("org.lwjgl.util.mapped.PrintActivity"); static final boolean PRINT_BYTECODE = false; //LWJGLUtil.DEBUG && LWJGLUtil.getPrivilegedBoolean("org.lwjgl.util.mapped.PrintBytecode"); private static final Map className_to_subtype;