Simplified ALC10.nalcOpenDevice
This commit is contained in:
parent
649822f65b
commit
a42f401331
|
@ -306,7 +306,7 @@
|
||||||
<target name="all" description="Creates the Java archives and the natives for the current platform" depends="jars, compile_native"/>
|
<target name="all" description="Creates the Java archives and the natives for the current platform" depends="jars, compile_native"/>
|
||||||
|
|
||||||
<!-- Create ONLY the jar archives -->
|
<!-- Create ONLY the jar archives -->
|
||||||
<target name="jars" description="Creates the Java archives ONLY and places them in libs/" depends="-initialize, generate-all, compile, -createjars">
|
<target name="jars" description="Creates the Java archives ONLY and places them in libs/" depends="-initialize, compile, -createjars">
|
||||||
<move todir="libs/">
|
<move todir="libs/">
|
||||||
<fileset dir="${lwjgl.temp}/jar">
|
<fileset dir="${lwjgl.temp}/jar">
|
||||||
<include name="*.jar"/>
|
<include name="*.jar"/>
|
||||||
|
|
|
@ -139,17 +139,9 @@ static jlong JNICALL Java_org_lwjgl_openal_ALC10_nalcOpenDevice (JNIEnv *env, jc
|
||||||
/* get device */
|
/* get device */
|
||||||
device = alcOpenDevice((ALubyte *) tokenstring);
|
device = alcOpenDevice((ALubyte *) tokenstring);
|
||||||
|
|
||||||
/* if error - cleanup and get out */
|
if(tokenstring != NULL) {
|
||||||
if(device == NULL) {
|
|
||||||
if(tokenstring != NULL) {
|
|
||||||
free(tokenstring);
|
|
||||||
}
|
|
||||||
return (jlong) NULL;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* clean up */
|
|
||||||
if (tokenstring != NULL)
|
|
||||||
free(tokenstring);
|
free(tokenstring);
|
||||||
|
}
|
||||||
|
|
||||||
return (jlong)((intptr_t)device);
|
return (jlong)((intptr_t)device);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue