# HG changeset patch # User Robert McIntyre # Date 1331102213 21600 # Node ID 75349da4c3440881314091b84094cae0a4168225 # Parent efa68261dba1cf6a88c45df00711a74de9d2a3f2 clojure hello world works diff -r efa68261dba1 -r 75349da4c344 .hgignore --- a/.hgignore Wed Mar 07 00:13:50 2012 -0600 +++ b/.hgignore Wed Mar 07 00:36:53 2012 -0600 @@ -14,4 +14,4 @@ build-aux/* java/dist/* java/headers/* -java/ant-targets-build.xml +java/.ant-targets-build.xml diff -r efa68261dba1 -r 75349da4c344 clojure/com/aurellem/gb_driver.clj --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/clojure/com/aurellem/gb_driver.clj Wed Mar 07 00:36:53 2012 -0600 @@ -0,0 +1,3 @@ +(ns com.aurellem.gb-driver) + + diff -r efa68261dba1 -r 75349da4c344 java/src/com/aurellem/gb/Gb.java --- a/java/src/com/aurellem/gb/Gb.java Wed Mar 07 00:13:50 2012 -0600 +++ b/java/src/com/aurellem/gb/Gb.java Wed Mar 07 00:36:53 2012 -0600 @@ -12,12 +12,17 @@ /** * Hello World! This is just to test the native interface. */ - public native void sayHello(); + public static native void sayHello(); /** * Run the emulator on a given rom * @param rom - the name of the rom. */ - public native void startEmulator(String rom); + public static native void startEmulator(String rom); + + + public static void loadVBA(){ + System.loadLibrary("vba"); + } } diff -r efa68261dba1 -r 75349da4c344 src/clojure/clojure.c --- a/src/clojure/clojure.c Wed Mar 07 00:13:50 2012 -0600 +++ b/src/clojure/clojure.c Wed Mar 07 00:36:53 2012 -0600 @@ -1,7 +1,26 @@ #include "com_aurellem_gb_Gb.h" +#define UNUSED(x) (void)(x) +/* + * Class: com_aurellem_gb_Gb + * Method: sayHello + * Signature: ()V + */ +JNIEXPORT void JNICALL Java_com_aurellem_gb_Gb_sayHello +(JNIEnv *env, jclass clazz){ + UNUSED(env);UNUSED(clazz); + printf("Hello from GB\n"); +} +/* + * Class: com_aurellem_gb_Gb + * Method: startEmulator + * Signature: (Ljava/lang/String;)V + */ +JNIEXPORT void JNICALL Java_com_aurellem_gb_Gb_startEmulator +(JNIEnv *env, jclass clazz, jstring str){ + UNUSED(env);UNUSED(clazz);UNUSED(str); +} -