1.1 --- a/configure.ac	Tue Mar 06 22:07:22 2012 -0600
     1.2 +++ b/configure.ac	Tue Mar 06 23:43:52 2012 -0600
     1.3 @@ -21,6 +21,7 @@
     1.4  AC_PATH_PROG(NASM, nasm)
     1.5  AC_PROG_LIBTOOL
     1.6  
     1.7 +
     1.8  # Checks for libraries.
     1.9  AC_CHECK_LIB(z, gzopen,
    1.10    , AC_MSG_ERROR([*** Cannot compile without zlib.]))
    1.11 @@ -63,9 +64,42 @@
    1.12  AC_FUNC_STRCOLL
    1.13  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])
    1.14  
    1.15 +
    1.16 +
    1.17 +# find JNI headers
    1.18 +AC_ARG_VAR([JAVA_INCLUDE_PATH], [The path to the jni.h])
    1.19 +AC_ARG_VAR([JAVA_INCLUDE_PATH2], [The path to jni_md.h])
    1.20 +
    1.21 +
    1.22 +if test "x$JAVA_INCLUDE_PATH" = "x"; then
    1.23 +   echo "----------------------------------"	
    1.24 +   echo "you must have JAVA_INCLUDE_PATH defined."
    1.25 +   echo "this is the path to jni.h"
    1.26 +   echo "----------------------------------"
    1.27 +fi
    1.28 +
    1.29 +if test "x$JAVA_INCLUDE_PATH2" = "x"; then
    1.30 +   echo "----------------------------------"	
    1.31 +   echo "you must have JAVA_INCLUDE_PATH2 defined."
    1.32 +   echo "this is the path to jni_md.h"
    1.33 +   echo "----------------------------------"
    1.34 +fi
    1.35 +
    1.36 +if test "x$JAVA_INCLUDE_PATH" = "x"; then
    1.37 +   AC_MSG_ERROR([JAVA_INCLUDE_PATH not defined])
    1.38 +fi
    1.39 +
    1.40 +if test "x$JAVA_INCLUDE_PATH2" = "x"; then
    1.41 +   AC_MSG_ERROR([JAVA_INCLUDE_PATH2 not defined])	
    1.42 +fi
    1.43 +
    1.44 +#AC_SUBST(JAVA_INCLUDE_PATH)
    1.45 +#AC_SUBST(JAVA_INCLUDE_PATH2)
    1.46 +
    1.47  AC_CONFIG_FILES([Makefile 
    1.48  	         src/Makefile
    1.49                   src/lua/Makefile
    1.50 +		 src/clojure/Makefile
    1.51  		 src/gb/Makefile
    1.52  		 src/gba/Makefile
    1.53  		 src/common/Makefile

     2.1 --- a/src/Makefile.am	Tue Mar 06 22:07:22 2012 -0600
     2.2 +++ b/src/Makefile.am	Tue Mar 06 23:43:52 2012 -0600
     2.3 @@ -1,5 +1,7 @@
     2.4 -SUBDIRS = SFMT lua gb gba common filters prof sdl
     2.5 +SUBDIRS = clojure SFMT lua gb gba common filters prof sdl 
     2.6  
     2.7  dist_sysconf_DATA = VisualBoyAdvance.cfg
     2.8  
     2.9 -noinst_HEADERS = Port.h NLS.h AutoBuild.h version.h
    2.10 +noinst_HEADERS = Port.h NLS.h AutoBuild.h version.h \
    2.11 +		 ../java/headers/com_aurellem_gb_Gb.h
    2.12 +

     3.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     3.2 +++ b/src/clojure/Makefile.am	Tue Mar 06 23:43:52 2012 -0600
     3.3 @@ -0,0 +1,11 @@
     3.4 +noinst_LTLIBRARIES = libgbclojure.la
     3.5 +
     3.6 +libgbclojure_la_SOURCES = \
     3.7 +	clojure.c
     3.8 +
     3.9 +AM_CPPFLAGS = \
    3.10 +	-I$(top_srcdir)/java/headers -I$(JAVA_INCLUDE_PATH) \
    3.11 +	-I$(JAVA_INCLUDE_PATH2)
    3.12 +
    3.13 +
    3.14 +

     4.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     4.2 +++ b/src/clojure/clojure.c	Tue Mar 06 23:43:52 2012 -0600
     4.3 @@ -0,0 +1,7 @@
     4.4 +#include "com_aurellem_gb_Gb.h"
     4.5 +
     4.6 +
     4.7 +
     4.8 +
     4.9 +
    4.10 +

     5.1 --- a/src/sdl/Makefile.am	Tue Mar 06 22:07:22 2012 -0600
     5.2 +++ b/src/sdl/Makefile.am	Tue Mar 06 23:43:52 2012 -0600
     5.3 @@ -1,8 +1,8 @@
     5.4 -bin_PROGRAMS = VisualBoyAdvance
     5.5 +lib_LTLIBRARIES = libvba.la
     5.6  
     5.7  #noinst_PROGRAMS = TestEmu
     5.8  
     5.9 -VisualBoyAdvance_SOURCES = \
    5.10 +libvba_la_SOURCES = \
    5.11  	Array.h		\
    5.12  	debugger.h	\
    5.13  	expr.cpp.h	\
    5.14 @@ -26,13 +26,14 @@
    5.15  #TestEmu.cpp
    5.16  
    5.17  
    5.18 -VisualBoyAdvance_LDADD =   	\
    5.19 -	../common/libgbcom.la	\
    5.20 -	../gb/libgb.la		\
    5.21 +libvba_la_LIBADD =   	\
    5.22 +	../common/libgbcom.la		\
    5.23 +	../gb/libgb.la			\
    5.24  	../gba/libgba.la		\
    5.25 -	../filters/lib386.la 	\
    5.26 -	../filters/libfilter.la	\
    5.27 -	../prof/libprof.la	\
    5.28 +	../filters/lib386.la 		\
    5.29 +	../filters/libfilter.la		\
    5.30 +	../prof/libprof.la		\
    5.31 +	../clojure/libgbclojure.la	\
    5.32  	../lua/libgblua.la       
    5.33  
    5.34  # TestEmu_SOURCES = \