Use macro annotation to load native library

This also removes the need for third projects to depend on a "loader library".

3 files changed, 0 insertions, 83 deletions

diff --git a/samples/basic/basic-native/src/CMakeLists.txt b/samples/basic/basic-native/src/CMakeLists.txt
deleted file mode 100644
index ec112b3..0000000
--- a/samples/basic/basic-native/src/CMakeLists.txt
+++ /dev/null
@@ -1,46 +0,0 @@
-cmake_minimum_required(VERSION 2.6)
-
-# Define project and related variables
-#
-project (demo)
-
-# Set versions and library name
-# Note: major version will be appended to library name
-#
-set (VERSION_MAJOR 1)
-set (VERSION_MINOR 2)
-set (VERSION_PATCH 3)
-set (LIB_NAME demo${VERSION_MAJOR})
-
-# Command-line options
-#
-# required by sbt-jni to install binaries to correct places
-set (LIB_INSTALL_DIR lib CACHE PATH "Path in which to install libraries (Autoconf equivalent to --libdir).")
-# required by sbt-jni to disable versioned libraries
-set (ENABLE_VERSIONED_LIB ON CACHE BOOLEAN "Generate versioned library files and symlinks.")
-
-# Setup JNI
-find_package(JNI REQUIRED)
-if (JNI_FOUND)
-    message (STATUS "JNI include directories: ${JNI_INCLUDE_DIRS}")
-endif()
-
-# Include directories
-include_directories(.)
-include_directories(include)
-include_directories(${JNI_INCLUDE_DIRS})
-
-# Setup main shared library
-# Note: major version is appended to library name
-add_library(${LIB_NAME} SHARED library.c)
-if (ENABLE_VERSIONED_LIB)
-   set_target_properties(
-	${LIB_NAME}
-	PROPERTIES
-	VERSION 0.${VERSION_MINOR}.${VERSION_PATCH} # major version always 0, it is included in name
-	SOVERSION 0
-   )
-endif()
-
-# Installation targets
-install(TARGETS ${LIB_NAME} LIBRARY DESTINATION ${LIB_INSTALL_DIR}) 
diff --git a/samples/basic/basic-native/src/include/ch_jodersky_jni_basic_Library__.h b/samples/basic/basic-native/src/include/ch_jodersky_jni_basic_Library__.h
deleted file mode 100644
index 60821e4..0000000
--- a/samples/basic/basic-native/src/include/ch_jodersky_jni_basic_Library__.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/* DO NOT EDIT THIS FILE - it is machine generated */
-#include <jni.h>
-/* Header for class ch_jodersky_jni_basic_Library__ */
-
-#ifndef _Included_ch_jodersky_jni_basic_Library__
-#define _Included_ch_jodersky_jni_basic_Library__
-#ifdef __cplusplus
-extern "C" {
-#endif
-/*
- * Class:     ch_jodersky_jni_basic_Library__
- * Method:    print
- * Signature: (Ljava/lang/String;)I
- */
-JNIEXPORT jint JNICALL Java_ch_jodersky_jni_basic_Library_00024_print
-  (JNIEnv *, jobject, jstring);
-
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/samples/basic/basic-native/src/library.c b/samples/basic/basic-native/src/library.c
deleted file mode 100644
index eec05e5..0000000
--- a/samples/basic/basic-native/src/library.c
+++ /dev/null
@@ -1,16 +0,0 @@
-#include <stdio.h>
-#include "ch_jodersky_jni_basic_Library__.h"
-
-/*
- * Class:     ch_jodersky_jni_basic_Library__
- * Method:    print
- * Signature: (Ljava/lang/String;)I
- */
-JNIEXPORT jint JNICALL Java_ch_jodersky_jni_basic_Library_00024_print
-(JNIEnv *env, jobject clazz, jstring message) {
-	const char* msg = (*env)->GetStringUTFChars(env, message, 0);
-	fprintf(stdout, "Printing from native library: %s", msg);
-	fflush(stdout);
-	(*env)->ReleaseStringUTFChars(env, message, msg);
-	return 0;
-}