diff --git a/.gitignore b/.gitignore index d8014a6..9398a26 100644 --- a/.gitignore +++ b/.gitignore @@ -4,4 +4,5 @@ .classpath .project .maven -build +bin +build \ No newline at end of file diff --git a/bin/.gitignore b/bin/.gitignore deleted file mode 100644 index 6d31dc4..0000000 --- a/bin/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/wiiscan/ diff --git a/bin/DelcomDLL.dll b/bin/DelcomDLL.dll new file mode 100644 index 0000000..ecfa470 Binary files /dev/null and b/bin/DelcomDLL.dll differ diff --git a/bin/wiiscan.exe b/bin/wiiscan.exe new file mode 100644 index 0000000..9e9e443 Binary files /dev/null and b/bin/wiiscan.exe differ diff --git a/build.gradle b/build.gradle index d26d6e0..5e439e7 100644 --- a/build.gradle +++ b/build.gradle @@ -7,16 +7,24 @@ repositories { maven { url 'https://github.com/Boukefalos/jlibloader/raw/mvn-repo/' } + maven { + url 'https://github.com/Boukefalos/libwiiuse/raw/mvn-repo/' + } + maven { + url 'https://github.com/Boukefalos/jlibwiiscan/raw/mvn-repo/' + } mavenCentral() } dependencies { compile 'com.github.boukefalos:jlibloader:0.3' + compile 'com.github.boukefalos:jlibwiiscan:0.9' } group = 'com.github.boukefalos' project.archivesBaseName = 'jlibwiiscan' -version = '0.9' +version = '0.1' +jniVersion = '0.9' task wrapper(type: Wrapper) { gradleVersion = '1.12' @@ -96,7 +104,7 @@ binaries.withType(SharedLibraryBinary) { binary -> } jniPom.groupId = project.group jniPom.artifactId = nativeJar.baseName - jniPom.version = version + jniPom.version = jniVersion jniPom.scopeMappings.mappings.clear() } def builderTask = binary.tasks.builder @@ -121,7 +129,7 @@ mainPom.withXml { provider -> def dep = deps.appendNode('dependency') dep.appendNode('groupId', project.group) dep.appendNode('artifactId', "${project.archivesBaseName}-${platform}") - dep.appendNode('version', version) + dep.appendNode('version', jniVersion) } def dep = deps.appendNode('dependency') dep.appendNode('groupId', 'com.github.boukefalos') diff --git a/src/main/java/wiiscan/Wiiscan.java b/src/main/java/wiiscan/Wiiscan.java index 08dfef8..432d101 100644 --- a/src/main/java/wiiscan/Wiiscan.java +++ b/src/main/java/wiiscan/Wiiscan.java @@ -3,8 +3,13 @@ package wiiscan; import com.github.boukefalos.jlibloader.Native; public class Wiiscan { - public static void load() { + public static String load() { + Native.load("com.github.boukefalos", "libwiiuse"); Native.load("com.github.boukefalos", "jlibwiiscan", "DelcomDLL"); - Native.binary("com.github.boukefalos", "jlibwiiscan", "sox"); + return Native.binary("com.github.boukefalos", "jlibwiiscan", "sox"); + } + + public static void main(String[] args) { + System.out.println(Wiiscan.load()); } } \ No newline at end of file