# HG changeset patch
# User Robert McIntyre <rlm@mit.edu>
# Date 1331099032 21600
# Node ID b1969e1b310dab9f3aec3855fa1687fd6bd9cb68
# Parent  f6ff410a87fddef1e36bc04d88f103da784caa10
added skeleton clojure gb driver

diff -r f6ff410a87fd -r b1969e1b310d configure.ac
--- a/configure.ac	Tue Mar 06 22:07:22 2012 -0600
+++ b/configure.ac	Tue Mar 06 23:43:52 2012 -0600
@@ -21,6 +21,7 @@
 AC_PATH_PROG(NASM, nasm)
 AC_PROG_LIBTOOL
 
+
 # Checks for libraries.
 AC_CHECK_LIB(z, gzopen,
   , AC_MSG_ERROR([*** Cannot compile without zlib.]))
@@ -63,9 +64,42 @@
 AC_FUNC_STRCOLL
 AC_CHECK_FUNCS([floor ftruncate gethostbyname gethostname inet_ntoa localeconv memchr memset modf pow setlocale socket sqrt strcasecmp strchr strcspn strdup strerror strpbrk strrchr strstr strtoul])
 
+
+
+# find JNI headers
+AC_ARG_VAR([JAVA_INCLUDE_PATH], [The path to the jni.h])
+AC_ARG_VAR([JAVA_INCLUDE_PATH2], [The path to jni_md.h])
+
+
+if test "x$JAVA_INCLUDE_PATH" = "x"; then
+   echo "----------------------------------"	
+   echo "you must have JAVA_INCLUDE_PATH defined."
+   echo "this is the path to jni.h"
+   echo "----------------------------------"
+fi
+
+if test "x$JAVA_INCLUDE_PATH2" = "x"; then
+   echo "----------------------------------"	
+   echo "you must have JAVA_INCLUDE_PATH2 defined."
+   echo "this is the path to jni_md.h"
+   echo "----------------------------------"
+fi
+
+if test "x$JAVA_INCLUDE_PATH" = "x"; then
+   AC_MSG_ERROR([JAVA_INCLUDE_PATH not defined])
+fi
+
+if test "x$JAVA_INCLUDE_PATH2" = "x"; then
+   AC_MSG_ERROR([JAVA_INCLUDE_PATH2 not defined])	
+fi
+
+#AC_SUBST(JAVA_INCLUDE_PATH)
+#AC_SUBST(JAVA_INCLUDE_PATH2)
+
 AC_CONFIG_FILES([Makefile 
 	         src/Makefile
                  src/lua/Makefile
+		 src/clojure/Makefile
 		 src/gb/Makefile
 		 src/gba/Makefile
 		 src/common/Makefile
diff -r f6ff410a87fd -r b1969e1b310d src/Makefile.am
--- a/src/Makefile.am	Tue Mar 06 22:07:22 2012 -0600
+++ b/src/Makefile.am	Tue Mar 06 23:43:52 2012 -0600
@@ -1,5 +1,7 @@
-SUBDIRS = SFMT lua gb gba common filters prof sdl
+SUBDIRS = clojure SFMT lua gb gba common filters prof sdl 
 
 dist_sysconf_DATA = VisualBoyAdvance.cfg
 
-noinst_HEADERS = Port.h NLS.h AutoBuild.h version.h
+noinst_HEADERS = Port.h NLS.h AutoBuild.h version.h \
+		 ../java/headers/com_aurellem_gb_Gb.h
+
diff -r f6ff410a87fd -r b1969e1b310d src/clojure/Makefile.am
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/clojure/Makefile.am	Tue Mar 06 23:43:52 2012 -0600
@@ -0,0 +1,11 @@
+noinst_LTLIBRARIES = libgbclojure.la
+
+libgbclojure_la_SOURCES = \
+	clojure.c
+
+AM_CPPFLAGS = \
+	-I$(top_srcdir)/java/headers -I$(JAVA_INCLUDE_PATH) \
+	-I$(JAVA_INCLUDE_PATH2)
+
+
+
diff -r f6ff410a87fd -r b1969e1b310d src/clojure/clojure.c
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/clojure/clojure.c	Tue Mar 06 23:43:52 2012 -0600
@@ -0,0 +1,7 @@
+#include "com_aurellem_gb_Gb.h"
+
+
+
+
+
+
diff -r f6ff410a87fd -r b1969e1b310d src/sdl/Makefile.am
--- a/src/sdl/Makefile.am	Tue Mar 06 22:07:22 2012 -0600
+++ b/src/sdl/Makefile.am	Tue Mar 06 23:43:52 2012 -0600
@@ -1,8 +1,8 @@
-bin_PROGRAMS = VisualBoyAdvance
+lib_LTLIBRARIES = libvba.la
 
 #noinst_PROGRAMS = TestEmu
 
-VisualBoyAdvance_SOURCES = \
+libvba_la_SOURCES = \
 	Array.h		\
 	debugger.h	\
 	expr.cpp.h	\
@@ -26,13 +26,14 @@
 #TestEmu.cpp
 
 
-VisualBoyAdvance_LDADD =   	\
-	../common/libgbcom.la	\
-	../gb/libgb.la		\
+libvba_la_LIBADD =   	\
+	../common/libgbcom.la		\
+	../gb/libgb.la			\
 	../gba/libgba.la		\
-	../filters/lib386.la 	\
-	../filters/libfilter.la	\
-	../prof/libprof.la	\
+	../filters/lib386.la 		\
+	../filters/libfilter.la		\
+	../prof/libprof.la		\
+	../clojure/libgbclojure.la	\
 	../lua/libgblua.la       
 
 # TestEmu_SOURCES = \