diff --git a/src/main/native/opus/Makefile.windows10.amd64 b/src/main/native/opus/Makefile.windows10.amd64 new file mode 100644 index 0000000..4022f87 --- /dev/null +++ b/src/main/native/opus/Makefile.windows10.amd64 @@ -0,0 +1,28 @@ +# -*-makefile-*- + +CC=gcc +JAVA = java-8-openjdk-amd64 +NATIVE = ../../resources/native/WINDOW~1/amd64/ +INCLUDES = -IC:/PROGRA~1/Java/jdk1.8.0_144/include\ + -IC:/PROGRA~1/Java/jdk1.8.0_144/include/win32\ + -I/usr/local/include +CFLAGS = -Ofast -Wall -fPIC $(INCLUDES) +LDFLAGS = -Wl,-soname,libjni_opus.dll,-rpath='$$ORIGIN' -shared +LDPATH = -L$(NATIVE) +LIBS = -lopus -lspeex -lspeexdsp +SOURCES = za_co_monadic_scopus_opus_Opus__.c za_co_monadic_scopus_speex_Speex__.c +TARGETLIB = libjni_opus.dll + +all: libjni_opus.dll + +clean: + rm -f *.o *~ $(TARGETLIB) + +$(TARGETLIB) : $(SOURCES:.c=.o) + $(CC) $(LDFLAGS) $(LDPATH) -o $@ $^ $(LIBS) + +install: $(TARGETLIB) + cp $(TARGETLIB) $(NATIVE) + +.c.o: + $(CC) -c $(CFLAGS) $< -o $@ diff --git a/src/main/native/opus/za_co_monadic_scopus_opus_Opus__.c b/src/main/native/opus/za_co_monadic_scopus_opus_Opus__.c index 04517e5..fd7150a 100644 --- a/src/main/native/opus/za_co_monadic_scopus_opus_Opus__.c +++ b/src/main/native/opus/za_co_monadic_scopus_opus_Opus__.c @@ -189,8 +189,8 @@ JNIEXPORT jint JNICALL Java_za_co_monadic_scopus_opus_Opus_00024_encoder_1set_1c } JNIEXPORT jstring JNICALL Java_za_co_monadic_scopus_opus_Opus_00024_error_1string - (JNIEnv *env, jobject clazz, jint errno) { - const char *err_str = opus_strerror(errno); + (JNIEnv *env, jobject clazz, jint errorno) { + const char *err_str = opus_strerror(errorno); return (*env)->NewStringUTF(env, err_str); } diff --git a/src/main/resources/native/Windows 10/amd64/libjni_opus.dll b/src/main/resources/native/Windows 10/amd64/libjni_opus.dll new file mode 100644 index 0000000..01fca4b Binary files /dev/null and b/src/main/resources/native/Windows 10/amd64/libjni_opus.dll differ diff --git a/src/main/resources/native/Windows 10/amd64/libopus-0.dll b/src/main/resources/native/Windows 10/amd64/libopus-0.dll new file mode 100644 index 0000000..0a296d0 Binary files /dev/null and b/src/main/resources/native/Windows 10/amd64/libopus-0.dll differ diff --git a/src/main/resources/native/Windows 10/amd64/libspeex-1.dll b/src/main/resources/native/Windows 10/amd64/libspeex-1.dll new file mode 100644 index 0000000..f085f9b Binary files /dev/null and b/src/main/resources/native/Windows 10/amd64/libspeex-1.dll differ diff --git a/src/main/resources/native/Windows 10/amd64/libspeexdsp-1.dll b/src/main/resources/native/Windows 10/amd64/libspeexdsp-1.dll new file mode 100644 index 0000000..3a47a6e Binary files /dev/null and b/src/main/resources/native/Windows 10/amd64/libspeexdsp-1.dll differ diff --git a/src/main/scala/za/co/monadic/scopus/Libraries.scala b/src/main/scala/za/co/monadic/scopus/Libraries.scala index 794a237..a385b96 100644 --- a/src/main/scala/za/co/monadic/scopus/Libraries.scala +++ b/src/main/scala/za/co/monadic/scopus/Libraries.scala @@ -35,6 +35,11 @@ object Libraries { LibLoader("libspeex.1.dylib", load = false) LibLoader("libspeexdsp.1.dylib", load = false) LibLoader("libjni_opus.dylib") + case "Windows 10/amd64" => + LibLoader("libopus-0.dll") + LibLoader("libspeex-1.dll") + LibLoader("libspeexdsp-1.dll") + LibLoader("libjni_opus.dll") case s: String => println(s"Unknown OS/platform combination: $s") sys.exit(-1)