diff options
| author | Sven Gothel <[email protected]> | 2010-12-13 06:27:55 +0100 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2010-12-13 06:27:55 +0100 |
| commit | e735c312c874ae6abc401b4765b24a83f5238a99 (patch) | |
| tree | aad59e95d70f47a04c0127ff698914e500507a65 /make | |
| parent | 11a7579be24c26f9ea53598a17f7ebe9d246bb33 (diff) | |
Cleanup (removed obsolete class / imports) ; Cg fix
Diffstat (limited to 'make')
| -rw-r--r-- | make/build-test.xml | 2 | ||||
| -rw-r--r-- | make/config/jogl/cg-common-CustomJavaCode.java | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/make/build-test.xml b/make/build-test.xml index d3ba5bec7..0dae3b9cd 100644 --- a/make/build-test.xml +++ b/make/build-test.xml @@ -99,7 +99,7 @@ <condition property="jvmarg.newt.headless" value="-Djava.awt.headless=true"><not><isset property="isOSX"/></not></condition> </target> - <target name="test.manual.run" depends="test.run.setup" unless="isOSX"> + <target name="test.manual.run" depends="test.run.setup"> <for param="test.class.path.m" keepgoing="true"> <!-- results in absolute path --> <fileset dir="${classes}"> diff --git a/make/config/jogl/cg-common-CustomJavaCode.java b/make/config/jogl/cg-common-CustomJavaCode.java index cdaa6f2b2..31d1961fc 100644 --- a/make/config/jogl/cg-common-CustomJavaCode.java +++ b/make/config/jogl/cg-common-CustomJavaCode.java @@ -1,12 +1,12 @@ -private static DynamicLookupHelper cgDynamicLookupHelper; -private static CgProcAddressTable cgProcAddressTable; +private static final DynamicLibraryBundle cgDynamicLookupHelper; +private static final CgProcAddressTable cgProcAddressTable; static { cgProcAddressTable = new CgProcAddressTable(); if(null==cgProcAddressTable) { throw new RuntimeException("Couldn't instantiate CgProcAddressTable"); } - DynamicLibraryBundle cgDynamicLookupHelper = new DynamicLibraryBundle(new CgDynamicLibraryBundleInfo()); + cgDynamicLookupHelper = new DynamicLibraryBundle(new CgDynamicLibraryBundleInfo()); if(null==cgDynamicLookupHelper) { throw new RuntimeException("Null CgDynamicLookupHelper"); } |