diff options
| author | Sven Gothel <[email protected]> | 2015-02-02 02:51:01 +0100 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2015-02-02 02:51:01 +0100 |
| commit | 84a5372eda5da00a1c4ce51d9d9faea68523dbd6 (patch) | |
| tree | 523fc497d6d218dbb9cb35447dfdc2a7d5837b3a /make | |
| parent | 58bd5a07aca65a9763dd51ab070d9945df87a7a4 (diff) | |
Bug 682 - Relocating javax.media.opengl.* -> com.jogamp.opengl.*
Diffstat (limited to 'make')
| -rw-r--r-- | make/resources/android/AndroidManifest-jocl.xml | 2 | ||||
| -rw-r--r-- | make/resources/android/AndroidManifest-test.xml | 2 | ||||
| -rwxr-xr-x | make/scripts/tests.sh | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/make/resources/android/AndroidManifest-jocl.xml b/make/resources/android/AndroidManifest-jocl.xml index 2f39c9ab..7fbf04dd 100644 --- a/make/resources/android/AndroidManifest-jocl.xml +++ b/make/resources/android/AndroidManifest-jocl.xml @@ -4,7 +4,7 @@ package="com.jogamp.opencl"> <uses-library android:name="com.jogamp.common" android:required="true" /> - <uses-library android:name="javax.media.opengl" android:required="true" /> + <uses-library android:name="com.jogamp.opengl" android:required="true" /> <uses-sdk android:minSdkVersion="9" android:targetSdkVersion="14"/> diff --git a/make/resources/android/AndroidManifest-test.xml b/make/resources/android/AndroidManifest-test.xml index bad971e5..b09b081a 100644 --- a/make/resources/android/AndroidManifest-test.xml +++ b/make/resources/android/AndroidManifest-test.xml @@ -4,7 +4,7 @@ package="com.jogamp.opencl.test"> <uses-library android:name="com.jogamp.common" android:required="true" /> - <uses-library android:name="javax.media.opengl" android:required="true" /> + <uses-library android:name="com.jogamp.opengl" android:required="true" /> <uses-library android:name="com.jogamp.opencl" android:required="true" /> <uses-library android:name="jogamp.android.launcher" android:required="true" /> diff --git a/make/scripts/tests.sh b/make/scripts/tests.sh index 19dff678..a839c171 100755 --- a/make/scripts/tests.sh +++ b/make/scripts/tests.sh @@ -119,12 +119,12 @@ function testawt() { #testnoawt com.jogamp.opencl.CLCommandQueueTest $* #testnoawt com.jogamp.opencl.CLExceptionTest $* #testnoawt com.jogamp.opencl.CLImageTest $* -testnoawt com.jogamp.opencl.CLProgramTest $* +#testnoawt com.jogamp.opencl.CLProgramTest $* #testnoawt com.jogamp.opencl.HighLevelBindingTest $* #testnoawt com.jogamp.opencl.LowLevelBindingTest $* #testnoawt com.jogamp.opencl.TestJoclVersion $* #testnoawt com.jogamp.opencl.TestUtils $* -#testnoawt com.jogamp.opencl.gl.CLGLTest $* +testnoawt com.jogamp.opencl.gl.CLGLTest $* #testnoawt com.jogamp.opencl.util.concurrent.CLMultiContextTest $* |