summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Bien <[email protected]>2010-03-22 18:59:03 +0100
committerMichael Bien <[email protected]>2010-03-22 18:59:03 +0100
commit2f08848b6bde6fad24c2c0e9ab170ff41cf0f077 (patch)
treeb025dba99a99ea32aefb1f4c3fa5a80150b615d9
parentc6c516c00040825f2f03b88dbc1747775b2708d2 (diff)
joal now compatible with upstream gluegen.
updated configuration files. fixed build.xml 'test' target.
-rw-r--r--.gitignore1
-rwxr-xr-xmake/build.xml10
-rwxr-xr-xmake/joal-alc.cfg2
-rwxr-xr-xmake/joalversion8
-rw-r--r--manifest.mf3
5 files changed, 14 insertions, 10 deletions
diff --git a/.gitignore b/.gitignore
index df37967..8d3f29a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
build
+test/classes
nbproject/private \ No newline at end of file
diff --git a/make/build.xml b/make/build.xml
index 3c2a8fd..324d923 100755
--- a/make/build.xml
+++ b/make/build.xml
@@ -685,7 +685,7 @@
<fileset dir="${javadoc}" />
<fileset dir="${javadoc.dev}" />
</delete>
- <ant dir="../unit_tests" target="clean"/>
+ <ant dir="../test" target="clean"/>
</target>
<!-- ================================================================== -->
@@ -708,9 +708,9 @@
- Build and run tests.
-->
- <target name="runtests" depends="all">
- <ant dir="../unit_tests" target="compile"/>
- <ant dir="../unit_tests" target="runOpenALTest"/>
- <ant dir="../unit_tests" target="runSound3DTest"/>
+ <target name="test" depends="all">
+ <ant dir="../test" target="compile"/>
+ <ant dir="../test" target="runOpenALTest"/>
+ <ant dir="../test" target="runSound3DTest"/>
</target>
</project>
diff --git a/make/joal-alc.cfg b/make/joal-alc.cfg
index 21f7449..50a8fa2 100755
--- a/make/joal-alc.cfg
+++ b/make/joal-alc.cfg
@@ -30,7 +30,7 @@ Ignore alcGetProcAddress
# implement alcGetString(NULL, ALC_DEVICE_SPECIFIER) in another method
RenameJavaMethod alcGetString alcGetStringImpl
# Specify the return length of this function with our own custom strlen
-ReturnValueCapacity alcGetString strlen_alc(_ptr0, {1}, _res)
+ReturnValueCapacity alcGetStringImpl strlen_alc(_device_ptr, {1}, _res)
# Note that we don't declare this as "ReturnsString" because we're
# going to wrap it in another method
diff --git a/make/joalversion b/make/joalversion
index 7c9ebd9..dc78238 100755
--- a/make/joalversion
+++ b/make/joalversion
@@ -1,8 +1,8 @@
Specification-Title: Java Binding for OpenAL
Specification-Version: @BASEVERSION@
-Specification-Vendor: java.net JOAL community
-Implementation-Title: Java Bindings for OpenAL Runtime Environment
+Specification-Vendor: JogAmp.org
+Implementation-Title: Java Bindings for the OpenAL API
Implementation-Version: @VERSION@
-Implementation-Vendor: java.net JOAL community
+Implementation-Vendor: JogAmp.org
Extension-Name: net.java.games.joal
-Implementation-Vendor-Id: com.sun
+Implementation-Vendor-Id: JogAmp.org
diff --git a/manifest.mf b/manifest.mf
new file mode 100644
index 0000000..328e8e5
--- /dev/null
+++ b/manifest.mf
@@ -0,0 +1,3 @@
+Manifest-Version: 1.0
+X-COMMENT: Main-Class will be added automatically by build
+