From 3630155ad0857ec4f74c8b84eb36b03c48199676 Mon Sep 17 00:00:00 2001
From: Hannes Janetzek <hannes.janetzek@gmail.com>
Date: Tue, 3 Dec 2013 20:10:56 +0100
Subject: [PATCH] move vtm/jni to separate c project

---
 jni/.cproject                                |  42 +++++
 jni/.project                                 |  27 ++++
 jni/Android.mk                               |  26 ++++
 jni/Application.mk                           |   1 +
 jni/build-android32.xml                      |  33 ++++
 jni/build-linux64.xml                        | 156 +++++++++++++++++++
 jni/build-windows32.xml                      | 156 +++++++++++++++++++
 jni/build-windows64.xml                      | 156 +++++++++++++++++++
 jni/build.xml                                |  28 ++++
 {vtm/jni => jni}/builder/JniBuilder.java     |   0
 {vtm/jni => jni}/gl/utils.c                  |   4 +-
 jni/memcpy_wrap.c                            |  18 +++
 {vtm/jni => jni}/tessellate/LICENSE          |   0
 {vtm/jni => jni}/tessellate/Makefile         |   0
 {vtm/jni => jni}/tessellate/README.md        |   0
 {vtm/jni => jni}/tessellate/TessellateJni.c  |   0
 {vtm/jni => jni}/tessellate/dict-list.h      |   0
 {vtm/jni => jni}/tessellate/dict.c           |   0
 {vtm/jni => jni}/tessellate/dict.h           |   0
 {vtm/jni => jni}/tessellate/geom.c           |   0
 {vtm/jni => jni}/tessellate/geom.h           |   0
 {vtm/jni => jni}/tessellate/glu.h            |   0
 {vtm/jni => jni}/tessellate/gluos.h          |   0
 {vtm/jni => jni}/tessellate/main.c           |   0
 {vtm/jni => jni}/tessellate/memalloc.c       |   0
 {vtm/jni => jni}/tessellate/memalloc.h       |   0
 {vtm/jni => jni}/tessellate/mesh.c           |   0
 {vtm/jni => jni}/tessellate/mesh.h           |   0
 {vtm/jni => jni}/tessellate/normal.c         |   0
 {vtm/jni => jni}/tessellate/normal.h         |   0
 {vtm/jni => jni}/tessellate/priorityq-heap.c |   0
 {vtm/jni => jni}/tessellate/priorityq-heap.h |   0
 {vtm/jni => jni}/tessellate/priorityq-sort.h |   0
 {vtm/jni => jni}/tessellate/priorityq.c      |   0
 {vtm/jni => jni}/tessellate/priorityq.h      |   0
 {vtm/jni => jni}/tessellate/render.c         |   0
 {vtm/jni => jni}/tessellate/render.h         |   0
 {vtm/jni => jni}/tessellate/sweep.c          |   0
 {vtm/jni => jni}/tessellate/sweep.h          |   0
 {vtm/jni => jni}/tessellate/tess.c           |   0
 {vtm/jni => jni}/tessellate/tess.h           |   0
 {vtm/jni => jni}/tessellate/tessellate.c     |   0
 {vtm/jni => jni}/tessellate/tessellate.h     |   0
 {vtm/jni => jni}/tessellate/tessmono.c       |   0
 {vtm/jni => jni}/tessellate/tessmono.h       |   0
 45 files changed, 645 insertions(+), 2 deletions(-)
 create mode 100644 jni/.cproject
 create mode 100644 jni/.project
 create mode 100644 jni/Android.mk
 create mode 100644 jni/Application.mk
 create mode 100644 jni/build-android32.xml
 create mode 100644 jni/build-linux64.xml
 create mode 100644 jni/build-windows32.xml
 create mode 100644 jni/build-windows64.xml
 create mode 100644 jni/build.xml
 rename {vtm/jni => jni}/builder/JniBuilder.java (100%)
 rename {vtm/jni => jni}/gl/utils.c (99%)
 create mode 100644 jni/memcpy_wrap.c
 rename {vtm/jni => jni}/tessellate/LICENSE (100%)
 rename {vtm/jni => jni}/tessellate/Makefile (100%)
 rename {vtm/jni => jni}/tessellate/README.md (100%)
 rename {vtm/jni => jni}/tessellate/TessellateJni.c (100%)
 rename {vtm/jni => jni}/tessellate/dict-list.h (100%)
 rename {vtm/jni => jni}/tessellate/dict.c (100%)
 rename {vtm/jni => jni}/tessellate/dict.h (100%)
 rename {vtm/jni => jni}/tessellate/geom.c (100%)
 rename {vtm/jni => jni}/tessellate/geom.h (100%)
 rename {vtm/jni => jni}/tessellate/glu.h (100%)
 rename {vtm/jni => jni}/tessellate/gluos.h (100%)
 rename {vtm/jni => jni}/tessellate/main.c (100%)
 rename {vtm/jni => jni}/tessellate/memalloc.c (100%)
 rename {vtm/jni => jni}/tessellate/memalloc.h (100%)
 rename {vtm/jni => jni}/tessellate/mesh.c (100%)
 rename {vtm/jni => jni}/tessellate/mesh.h (100%)
 rename {vtm/jni => jni}/tessellate/normal.c (100%)
 rename {vtm/jni => jni}/tessellate/normal.h (100%)
 rename {vtm/jni => jni}/tessellate/priorityq-heap.c (100%)
 rename {vtm/jni => jni}/tessellate/priorityq-heap.h (100%)
 rename {vtm/jni => jni}/tessellate/priorityq-sort.h (100%)
 rename {vtm/jni => jni}/tessellate/priorityq.c (100%)
 rename {vtm/jni => jni}/tessellate/priorityq.h (100%)
 rename {vtm/jni => jni}/tessellate/render.c (100%)
 rename {vtm/jni => jni}/tessellate/render.h (100%)
 rename {vtm/jni => jni}/tessellate/sweep.c (100%)
 rename {vtm/jni => jni}/tessellate/sweep.h (100%)
 rename {vtm/jni => jni}/tessellate/tess.c (100%)
 rename {vtm/jni => jni}/tessellate/tess.h (100%)
 rename {vtm/jni => jni}/tessellate/tessellate.c (100%)
 rename {vtm/jni => jni}/tessellate/tessellate.h (100%)
 rename {vtm/jni => jni}/tessellate/tessmono.c (100%)
 rename {vtm/jni => jni}/tessellate/tessmono.h (100%)

diff --git a/jni/.cproject b/jni/.cproject
new file mode 100644
index 00000000..240904ed
--- /dev/null
+++ b/jni/.cproject
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?fileVersion 4.0.0?><cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">
+	<storageModule moduleId="org.eclipse.cdt.core.settings">
+		<cconfiguration id="cdt.managedbuild.toolchain.gnu.base.1587393048">
+			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="cdt.managedbuild.toolchain.gnu.base.1587393048" moduleId="org.eclipse.cdt.core.settings" name="Default">
+				<externalSettings/>
+				<extensions>
+					<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
+					<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+				</extensions>
+			</storageModule>
+			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
+				<configuration buildProperties="" id="cdt.managedbuild.toolchain.gnu.base.1587393048" name="Default" parent="org.eclipse.cdt.build.core.emptycfg">
+					<folderInfo id="cdt.managedbuild.toolchain.gnu.base.1587393048.116574534" name="/" resourcePath="">
+						<toolChain id="cdt.managedbuild.toolchain.gnu.base.223412825" name="cdt.managedbuild.toolchain.gnu.base" superClass="cdt.managedbuild.toolchain.gnu.base">
+							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="cdt.managedbuild.target.gnu.platform.base.385578518" name="Debug Platform" osList="linux,hpux,aix,qnx" superClass="cdt.managedbuild.target.gnu.platform.base"/>
+							<builder id="cdt.managedbuild.target.gnu.builder.base.156937647" managedBuildOn="false" name="Gnu Make Builder.Default" superClass="cdt.managedbuild.target.gnu.builder.base"/>
+							<tool id="cdt.managedbuild.tool.gnu.archiver.base.1823835369" name="GCC Archiver" superClass="cdt.managedbuild.tool.gnu.archiver.base"/>
+							<tool id="cdt.managedbuild.tool.gnu.cpp.compiler.base.360207042" name="GCC C++ Compiler" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.base"/>
+							<tool id="cdt.managedbuild.tool.gnu.c.compiler.base.1095290162" name="GCC C Compiler" superClass="cdt.managedbuild.tool.gnu.c.compiler.base"/>
+							<tool id="cdt.managedbuild.tool.gnu.c.linker.base.335083411" name="GCC C Linker" superClass="cdt.managedbuild.tool.gnu.c.linker.base"/>
+							<tool id="cdt.managedbuild.tool.gnu.cpp.linker.base.1727739418" name="GCC C++ Linker" superClass="cdt.managedbuild.tool.gnu.cpp.linker.base"/>
+							<tool id="cdt.managedbuild.tool.gnu.assembler.base.2019534622" name="GCC Assembler" superClass="cdt.managedbuild.tool.gnu.assembler.base"/>
+						</toolChain>
+					</folderInfo>
+				</configuration>
+			</storageModule>
+			<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
+		</cconfiguration>
+	</storageModule>
+	<storageModule moduleId="cdtBuildSystem" version="4.0.0">
+		<project id="vtm-jni.null.1777174385" name="vtm-jni"/>
+	</storageModule>
+	<storageModule moduleId="scannerConfiguration">
+		<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
+	</storageModule>
+	<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
+</cproject>
diff --git a/jni/.project b/jni/.project
new file mode 100644
index 00000000..9487b4af
--- /dev/null
+++ b/jni/.project
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>vtm-jni</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name>
+			<triggers>clean,full,incremental,</triggers>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder</name>
+			<triggers>full,incremental,</triggers>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.cdt.core.cnature</nature>
+		<nature>org.eclipse.cdt.core.ccnature</nature>
+		<nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>
+		<nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>
+	</natures>
+</projectDescription>
diff --git a/jni/Android.mk b/jni/Android.mk
new file mode 100644
index 00000000..751d9a3e
--- /dev/null
+++ b/jni/Android.mk
@@ -0,0 +1,26 @@
+LOCAL_PATH:= $(call my-dir)
+include $(CLEAR_VARS)
+ 
+LOCAL_MODULE    := vtm-jni
+LOCAL_C_INCLUDES := . 
+ 
+LOCAL_CFLAGS := $(LOCAL_C_INCLUDES:%=-I%) -O2 -Wall -D__ANDROID__ -Wall -std=c99 -O2 -ffast-math
+LOCAL_CPPFLAGS := $(LOCAL_C_INCLUDES:%=-I%) -O2 -Wall -D__ANDROID__ -Wall -std=c99 -O2 -ffast-math
+LOCAL_LDLIBS := -lm -llog
+LOCAL_ARM_MODE  := arm
+ 
+LOCAL_SRC_FILES := gl/utils.c\
+	tessellate/TessellateJni.c\
+	tessellate/render.c\
+	tessellate/memalloc.c\
+	tessellate/geom.c\
+	tessellate/dict.c\
+	tessellate/tessmono.c\
+	tessellate/normal.c\
+	tessellate/tessellate.c\
+	tessellate/mesh.c\
+	tessellate/tess.c\
+	tessellate/priorityq.c\
+	tessellate/sweep.c
+ 
+include $(BUILD_SHARED_LIBRARY)
diff --git a/jni/Application.mk b/jni/Application.mk
new file mode 100644
index 00000000..5db54170
--- /dev/null
+++ b/jni/Application.mk
@@ -0,0 +1 @@
+APP_ABI := armeabi armeabi-v7a x86
\ No newline at end of file
diff --git a/jni/build-android32.xml b/jni/build-android32.xml
new file mode 100644
index 00000000..4487f924
--- /dev/null
+++ b/jni/build-android32.xml
@@ -0,0 +1,33 @@
+<project name="android-natives" basedir="." default="postcompile">
+	<property environment="env" />
+	<!--  the suffix ndk-build executable -->	
+	<property name="ndkSuffix" value="" />
+
+	<target name="clean" depends="check-for-ndk" if="has-ndk-build">
+		<exec executable="${env.NDK_HOME}/ndk-build${ndkSuffix}" failonerror="true">
+			<arg value="clean"/>
+		</exec>
+	</target>
+
+	<target name="precompile" depends="check-for-ndk">
+		
+	</target>
+
+	<target name="compile-natives" depends="precompile" if="has-ndk-build">
+		<echo>ndk_home: ${env.NDK_HOME}</echo>
+		<exec executable="${env.NDK_HOME}/ndk-build${ndkSuffix}" failonerror="true"/>
+	</target>
+	
+	<target name="postcompile" depends="compile-natives">
+		
+	</target>
+
+	<target name="check-for-ndk">
+		<condition property="ndk-build-found">
+			<available file="ndk-build${ndkSuffix}" filepath="${env.NDK_HOME}"/>
+		</condition>
+		<condition property="has-ndk-build">
+			<equals arg1="${ndk-build-found}" arg2="true"/>
+		</condition>
+	</target>
+</project>
diff --git a/jni/build-linux64.xml b/jni/build-linux64.xml
new file mode 100644
index 00000000..b34ca65c
--- /dev/null
+++ b/jni/build-linux64.xml
@@ -0,0 +1,156 @@
+<project name="vtm-jni-Linux-64" basedir="." default="postcompile">
+	<!-- include the environment -->
+	<property environment="env"/>	
+	<!-- output directory for temporary object files -->
+	<property name="buildDir" value="target/linux64" />
+	<!-- output directory for the shared library -->
+	<property name="libsDir" value="../libs/linux64" />
+	<!-- the name of the shared library -->
+	<property name="libName" value="libvtm-jni64.so"/>
+	<!-- the jni header jniPlatform to use -->
+	<property name="jniPlatform" value="linux"/>
+	<!-- the compilerPrefix for the C & C++ compilers -->
+	<property name="compilerPrefix" value=""/>
+	<!--  the compilerSuffix for the C & C++ compilers -->	
+	<property name="compilerSuffix" value="" />	
+	
+	<!-- define gcc compiler, options and files to compile -->
+	<property name="gcc" value="${compilerPrefix}gcc${compilerSuffix}"/>	
+	<property name="gcc-opts" value="-c -Wall -O2 -mfpmath=sse -msse -fmessage-length=0 -m64 -fPIC -Wall -std=c99 -O2 -ffast-math"/>
+	<fileset id="gcc-files" dir="./">
+		<exclude name="target/"/>		
+				<include name="memcpy_wrap.c"/>
+		<include name="gl/utils.c"/>
+		<include name="tessellate/dict.c"/>
+		<include name="tessellate/mesh.c"/>
+		<include name="tessellate/render.c"/>
+		<include name="tessellate/tess.c"/>
+		<include name="tessellate/geom.c"/>
+		<include name="tessellate/memalloc.c"/>
+		<include name="tessellate/normal.c"/>
+		<include name="tessellate/priorityq.c"/>
+		<include name="tessellate/sweep.c"/>
+		<include name="tessellate/tessmono.c"/>
+		<include name="tessellate/tessellate.c"/>
+		<include name="tessellate/TessellateJni.c"/>
+
+		
+	</fileset>
+	
+	<!-- define g++ compiler, options and files to compile -->
+	<property name="g++" value="${compilerPrefix}g++${compilerSuffix}"/>
+	<property name="g++-opts" value="-c -Wall -O2 -mfpmath=sse -msse -fmessage-length=0 -m64 -fPIC -Wall -std=c99 -O2 -ffast-math"/>
+	<fileset id="g++-files" dir="./">
+		<exclude name="target/"/>
+				<include name="**/*.cpp"/>
+
+		
+	</fileset>
+
+	<!-- define linker and options -->
+	<property name="linker" value="${compilerPrefix}g++${compilerSuffix}"/>
+	<property name="linker-opts" value="-shared -m64 -Wl,-wrap,memcpy"/>
+	<property name="libraries" value=""/>
+	
+	<!-- cleans the build directory, removes all object files and shared libs -->
+	<target name="clean">
+		<delete includeemptydirs="true" quiet="true">
+			<fileset dir="${buildDir}"/>
+			<fileset dir="${libsDir}" includes="**/*" excludes="**/.svn"/>
+		</delete>
+	</target>
+	
+	<target name="precompile">
+		<condition property="compiler-found">
+			<and>
+				<or>
+					<!-- Include both b/c Windows might be either -->
+					<available file="${g++}" filepath="${env.PATH}"/>
+					<available file="${g++}" filepath="${env.Path}"/>
+				</or>
+				<or>
+					<!-- Include both b/c Windows might be either -->
+					<available file="${gcc}" filepath="${env.PATH}"/>
+					<available file="${gcc}" filepath="${env.Path}"/>
+				</or>
+			</and>
+		</condition>
+		<condition property="has-compiler">
+			<equals arg1="${compiler-found}" arg2="true"/>
+		</condition>
+		
+	</target>
+	
+	<target name="create-build-dir" depends="precompile" if="has-compiler">
+		<!-- FIXME this is pretty nasty :/ -->
+		<copy todir="${buildDir}">
+			<fileset refid="g++-files"/>
+			<fileset refid="gcc-files"/>
+		</copy>
+		<delete>
+			<fileset dir="${buildDir}">
+				<include name="*"/>
+				<exclude name="*.o"/>
+			</fileset>
+		</delete>
+	</target>
+
+	<!-- compiles all C and C++ files to object files in the build directory -->
+	<target name="compile" depends="create-build-dir" if="has-compiler">
+		<mkdir dir="${buildDir}"/>
+		<apply failonerror="true" executable="${g++}" dest="${buildDir}" verbose="true">
+			<arg line="${g++-opts}"/>
+			<arg value="-Ijni-headers"/>
+			<arg value="-Ijni-headers/${jniPlatform}"/>
+			<arg value="-I."/>
+						<arg value="-I."/>
+
+			<srcfile/>
+			<arg value="-o"/>
+			<targetfile/>
+			<fileset refid="g++-files"/>
+			<compositemapper>
+				<mapper type="glob" from="*.cpp" to="*.o"/>
+				<mapper type="glob" from="*.mm" to="*.o"/>
+			</compositemapper>
+		</apply>
+		<apply failonerror="true" executable="${gcc}" dest="${buildDir}" verbose="true">
+			<arg line="${gcc-opts}"/>
+			<arg value="-Ijni-headers"/>
+			<arg value="-Ijni-headers/${jniPlatform}"/>
+			<arg value="-I."/>
+						<arg value="-I."/>
+
+			<srcfile/>
+			<arg value="-o"/>
+			<targetfile/>
+			<fileset refid="gcc-files"/>
+			<compositemapper>
+				<mapper type="glob" from="*.c" to="*.o"/>
+				<mapper type="glob" from="*.m" to="*.o"/>
+			</compositemapper>
+		</apply>
+	</target>	
+
+	<!-- links the shared library based on the previously compiled object files -->	
+	<target name="link" depends="compile" if="has-compiler">
+		<fileset dir="${buildDir}" id="objFileSet">
+			<patternset>
+				<include name="**/*.o" />
+			</patternset>
+		</fileset>
+		<pathconvert pathsep=" " property="objFiles" refid="objFileSet" />
+		<mkdir dir="${libsDir}" />
+		<exec executable="${linker}" failonerror="true" dir="${buildDir}">
+			<arg line="${linker-opts}" />
+			<arg value="-o" />
+			<arg path="${libsDir}/${libName}" />
+			<arg line="${objFiles}"/>
+			<arg line="${libraries}" />
+		</exec>
+	</target>	
+	
+	<target name="postcompile" depends="link">
+		
+	</target>
+</project>
diff --git a/jni/build-windows32.xml b/jni/build-windows32.xml
new file mode 100644
index 00000000..c2127642
--- /dev/null
+++ b/jni/build-windows32.xml
@@ -0,0 +1,156 @@
+<project name="vtm-jni-Windows-32" basedir="." default="postcompile">
+	<!-- include the environment -->
+	<property environment="env"/>	
+	<!-- output directory for temporary object files -->
+	<property name="buildDir" value="target/windows32" />
+	<!-- output directory for the shared library -->
+	<property name="libsDir" value="../libs/windows32" />
+	<!-- the name of the shared library -->
+	<property name="libName" value="vtm-jni.dll"/>
+	<!-- the jni header jniPlatform to use -->
+	<property name="jniPlatform" value="win32"/>
+	<!-- the compilerPrefix for the C & C++ compilers -->
+	<property name="compilerPrefix" value="i686-w64-mingw32-"/>
+	<!--  the compilerSuffix for the C & C++ compilers -->	
+	<property name="compilerSuffix" value="" />	
+	
+	<!-- define gcc compiler, options and files to compile -->
+	<property name="gcc" value="${compilerPrefix}gcc${compilerSuffix}"/>	
+	<property name="gcc-opts" value="-c -Wall -O2 -mfpmath=sse -msse2 -fmessage-length=0 -m32 -Wall -std=c99 -O2 -ffast-math"/>
+	<fileset id="gcc-files" dir="./">
+		<exclude name="target/"/>		
+				<include name="memcpy_wrap.c"/>
+		<include name="gl/utils.c"/>
+		<include name="tessellate/dict.c"/>
+		<include name="tessellate/mesh.c"/>
+		<include name="tessellate/render.c"/>
+		<include name="tessellate/tess.c"/>
+		<include name="tessellate/geom.c"/>
+		<include name="tessellate/memalloc.c"/>
+		<include name="tessellate/normal.c"/>
+		<include name="tessellate/priorityq.c"/>
+		<include name="tessellate/sweep.c"/>
+		<include name="tessellate/tessmono.c"/>
+		<include name="tessellate/tessellate.c"/>
+		<include name="tessellate/TessellateJni.c"/>
+
+		
+	</fileset>
+	
+	<!-- define g++ compiler, options and files to compile -->
+	<property name="g++" value="${compilerPrefix}g++${compilerSuffix}"/>
+	<property name="g++-opts" value="-c -Wall -O2 -mfpmath=sse -msse2 -fmessage-length=0 -m32 -Wall -std=c99 -O2 -ffast-math"/>
+	<fileset id="g++-files" dir="./">
+		<exclude name="target/"/>
+				<include name="**/*.cpp"/>
+
+		
+	</fileset>
+
+	<!-- define linker and options -->
+	<property name="linker" value="${compilerPrefix}g++${compilerSuffix}"/>
+	<property name="linker-opts" value="-Wl,--kill-at -shared -m32 -static-libgcc -static-libstdc++"/>
+	<property name="libraries" value=""/>
+	
+	<!-- cleans the build directory, removes all object files and shared libs -->
+	<target name="clean">
+		<delete includeemptydirs="true" quiet="true">
+			<fileset dir="${buildDir}"/>
+			<fileset dir="${libsDir}" includes="**/*" excludes="**/.svn"/>
+		</delete>
+	</target>
+	
+	<target name="precompile">
+		<condition property="compiler-found">
+			<and>
+				<or>
+					<!-- Include both b/c Windows might be either -->
+					<available file="${g++}" filepath="${env.PATH}"/>
+					<available file="${g++}" filepath="${env.Path}"/>
+				</or>
+				<or>
+					<!-- Include both b/c Windows might be either -->
+					<available file="${gcc}" filepath="${env.PATH}"/>
+					<available file="${gcc}" filepath="${env.Path}"/>
+				</or>
+			</and>
+		</condition>
+		<condition property="has-compiler">
+			<equals arg1="${compiler-found}" arg2="true"/>
+		</condition>
+		
+	</target>
+	
+	<target name="create-build-dir" depends="precompile" if="has-compiler">
+		<!-- FIXME this is pretty nasty :/ -->
+		<copy todir="${buildDir}">
+			<fileset refid="g++-files"/>
+			<fileset refid="gcc-files"/>
+		</copy>
+		<delete>
+			<fileset dir="${buildDir}">
+				<include name="*"/>
+				<exclude name="*.o"/>
+			</fileset>
+		</delete>
+	</target>
+
+	<!-- compiles all C and C++ files to object files in the build directory -->
+	<target name="compile" depends="create-build-dir" if="has-compiler">
+		<mkdir dir="${buildDir}"/>
+		<apply failonerror="true" executable="${g++}" dest="${buildDir}" verbose="true">
+			<arg line="${g++-opts}"/>
+			<arg value="-Ijni-headers"/>
+			<arg value="-Ijni-headers/${jniPlatform}"/>
+			<arg value="-I."/>
+						<arg value="-I."/>
+
+			<srcfile/>
+			<arg value="-o"/>
+			<targetfile/>
+			<fileset refid="g++-files"/>
+			<compositemapper>
+				<mapper type="glob" from="*.cpp" to="*.o"/>
+				<mapper type="glob" from="*.mm" to="*.o"/>
+			</compositemapper>
+		</apply>
+		<apply failonerror="true" executable="${gcc}" dest="${buildDir}" verbose="true">
+			<arg line="${gcc-opts}"/>
+			<arg value="-Ijni-headers"/>
+			<arg value="-Ijni-headers/${jniPlatform}"/>
+			<arg value="-I."/>
+						<arg value="-I."/>
+
+			<srcfile/>
+			<arg value="-o"/>
+			<targetfile/>
+			<fileset refid="gcc-files"/>
+			<compositemapper>
+				<mapper type="glob" from="*.c" to="*.o"/>
+				<mapper type="glob" from="*.m" to="*.o"/>
+			</compositemapper>
+		</apply>
+	</target>	
+
+	<!-- links the shared library based on the previously compiled object files -->	
+	<target name="link" depends="compile" if="has-compiler">
+		<fileset dir="${buildDir}" id="objFileSet">
+			<patternset>
+				<include name="**/*.o" />
+			</patternset>
+		</fileset>
+		<pathconvert pathsep=" " property="objFiles" refid="objFileSet" />
+		<mkdir dir="${libsDir}" />
+		<exec executable="${linker}" failonerror="true" dir="${buildDir}">
+			<arg line="${linker-opts}" />
+			<arg value="-o" />
+			<arg path="${libsDir}/${libName}" />
+			<arg line="${objFiles}"/>
+			<arg line="${libraries}" />
+		</exec>
+	</target>	
+	
+	<target name="postcompile" depends="link">
+		
+	</target>
+</project>
diff --git a/jni/build-windows64.xml b/jni/build-windows64.xml
new file mode 100644
index 00000000..c57f258d
--- /dev/null
+++ b/jni/build-windows64.xml
@@ -0,0 +1,156 @@
+<project name="vtm-jni-Windows-64" basedir="." default="postcompile">
+	<!-- include the environment -->
+	<property environment="env"/>	
+	<!-- output directory for temporary object files -->
+	<property name="buildDir" value="target/windows64" />
+	<!-- output directory for the shared library -->
+	<property name="libsDir" value="../libs/windows64" />
+	<!-- the name of the shared library -->
+	<property name="libName" value="vtm-jni64.dll"/>
+	<!-- the jni header jniPlatform to use -->
+	<property name="jniPlatform" value="win32"/>
+	<!-- the compilerPrefix for the C & C++ compilers -->
+	<property name="compilerPrefix" value="x86_64-w64-mingw32-"/>
+	<!--  the compilerSuffix for the C & C++ compilers -->	
+	<property name="compilerSuffix" value="" />	
+	
+	<!-- define gcc compiler, options and files to compile -->
+	<property name="gcc" value="${compilerPrefix}gcc${compilerSuffix}"/>	
+	<property name="gcc-opts" value="-c -Wall -O2 -mfpmath=sse -msse2 -fmessage-length=0 -m64 -Wall -std=c99 -O2 -ffast-math"/>
+	<fileset id="gcc-files" dir="./">
+		<exclude name="target/"/>		
+				<include name="memcpy_wrap.c"/>
+		<include name="gl/utils.c"/>
+		<include name="tessellate/dict.c"/>
+		<include name="tessellate/mesh.c"/>
+		<include name="tessellate/render.c"/>
+		<include name="tessellate/tess.c"/>
+		<include name="tessellate/geom.c"/>
+		<include name="tessellate/memalloc.c"/>
+		<include name="tessellate/normal.c"/>
+		<include name="tessellate/priorityq.c"/>
+		<include name="tessellate/sweep.c"/>
+		<include name="tessellate/tessmono.c"/>
+		<include name="tessellate/tessellate.c"/>
+		<include name="tessellate/TessellateJni.c"/>
+
+		
+	</fileset>
+	
+	<!-- define g++ compiler, options and files to compile -->
+	<property name="g++" value="${compilerPrefix}g++${compilerSuffix}"/>
+	<property name="g++-opts" value="-c -Wall -O2 -mfpmath=sse -msse2 -fmessage-length=0 -m64 -Wall -std=c99 -O2 -ffast-math"/>
+	<fileset id="g++-files" dir="./">
+		<exclude name="target/"/>
+				<include name="**/*.cpp"/>
+
+		
+	</fileset>
+
+	<!-- define linker and options -->
+	<property name="linker" value="${compilerPrefix}g++${compilerSuffix}"/>
+	<property name="linker-opts" value="-Wl,--kill-at -shared -static-libgcc -static-libstdc++ -m64"/>
+	<property name="libraries" value=""/>
+	
+	<!-- cleans the build directory, removes all object files and shared libs -->
+	<target name="clean">
+		<delete includeemptydirs="true" quiet="true">
+			<fileset dir="${buildDir}"/>
+			<fileset dir="${libsDir}" includes="**/*" excludes="**/.svn"/>
+		</delete>
+	</target>
+	
+	<target name="precompile">
+		<condition property="compiler-found">
+			<and>
+				<or>
+					<!-- Include both b/c Windows might be either -->
+					<available file="${g++}" filepath="${env.PATH}"/>
+					<available file="${g++}" filepath="${env.Path}"/>
+				</or>
+				<or>
+					<!-- Include both b/c Windows might be either -->
+					<available file="${gcc}" filepath="${env.PATH}"/>
+					<available file="${gcc}" filepath="${env.Path}"/>
+				</or>
+			</and>
+		</condition>
+		<condition property="has-compiler">
+			<equals arg1="${compiler-found}" arg2="true"/>
+		</condition>
+		
+	</target>
+	
+	<target name="create-build-dir" depends="precompile" if="has-compiler">
+		<!-- FIXME this is pretty nasty :/ -->
+		<copy todir="${buildDir}">
+			<fileset refid="g++-files"/>
+			<fileset refid="gcc-files"/>
+		</copy>
+		<delete>
+			<fileset dir="${buildDir}">
+				<include name="*"/>
+				<exclude name="*.o"/>
+			</fileset>
+		</delete>
+	</target>
+
+	<!-- compiles all C and C++ files to object files in the build directory -->
+	<target name="compile" depends="create-build-dir" if="has-compiler">
+		<mkdir dir="${buildDir}"/>
+		<apply failonerror="true" executable="${g++}" dest="${buildDir}" verbose="true">
+			<arg line="${g++-opts}"/>
+			<arg value="-Ijni-headers"/>
+			<arg value="-Ijni-headers/${jniPlatform}"/>
+			<arg value="-I."/>
+						<arg value="-I."/>
+
+			<srcfile/>
+			<arg value="-o"/>
+			<targetfile/>
+			<fileset refid="g++-files"/>
+			<compositemapper>
+				<mapper type="glob" from="*.cpp" to="*.o"/>
+				<mapper type="glob" from="*.mm" to="*.o"/>
+			</compositemapper>
+		</apply>
+		<apply failonerror="true" executable="${gcc}" dest="${buildDir}" verbose="true">
+			<arg line="${gcc-opts}"/>
+			<arg value="-Ijni-headers"/>
+			<arg value="-Ijni-headers/${jniPlatform}"/>
+			<arg value="-I."/>
+						<arg value="-I."/>
+
+			<srcfile/>
+			<arg value="-o"/>
+			<targetfile/>
+			<fileset refid="gcc-files"/>
+			<compositemapper>
+				<mapper type="glob" from="*.c" to="*.o"/>
+				<mapper type="glob" from="*.m" to="*.o"/>
+			</compositemapper>
+		</apply>
+	</target>	
+
+	<!-- links the shared library based on the previously compiled object files -->	
+	<target name="link" depends="compile" if="has-compiler">
+		<fileset dir="${buildDir}" id="objFileSet">
+			<patternset>
+				<include name="**/*.o" />
+			</patternset>
+		</fileset>
+		<pathconvert pathsep=" " property="objFiles" refid="objFileSet" />
+		<mkdir dir="${libsDir}" />
+		<exec executable="${linker}" failonerror="true" dir="${buildDir}">
+			<arg line="${linker-opts}" />
+			<arg value="-o" />
+			<arg path="${libsDir}/${libName}" />
+			<arg line="${objFiles}"/>
+			<arg line="${libraries}" />
+		</exec>
+	</target>	
+	
+	<target name="postcompile" depends="link">
+		
+	</target>
+</project>
diff --git a/jni/build.xml b/jni/build.xml
new file mode 100644
index 00000000..7a9f0343
--- /dev/null
+++ b/jni/build.xml
@@ -0,0 +1,28 @@
+<project name="vtm-jni-natives" basedir="." default="all">
+	<target name="clean">
+		<ant antfile="build-windows32.xml" target="clean"/>
+		<ant antfile="build-windows64.xml" target="clean"/>
+		<ant antfile="build-linux64.xml" target="clean"/>
+		<ant antfile="build-android32.xml" target="clean"/>
+
+	</target>
+	
+	<target name="compile-natives">
+		<ant antfile="build-windows32.xml"/>
+		<ant antfile="build-windows64.xml"/>
+		<ant antfile="build-linux64.xml"/>
+		<ant antfile="build-android32.xml"/>
+
+	</target>
+	
+	<target name="pack-natives">
+		<jar destfile="../libs/vtm-jni-natives.jar">
+			<fileset dir="../libs/windows32" includes="vtm-jni.dll"/>
+			<fileset dir="../libs/windows64" includes="vtm-jni64.dll"/>
+			<fileset dir="../libs/linux64" includes="libvtm-jni64.so"/>
+
+		</jar>
+	</target>
+
+	<target name="all" depends="compile-natives,pack-natives"/>
+</project>
diff --git a/vtm/jni/builder/JniBuilder.java b/jni/builder/JniBuilder.java
similarity index 100%
rename from vtm/jni/builder/JniBuilder.java
rename to jni/builder/JniBuilder.java
diff --git a/vtm/jni/gl/utils.c b/jni/gl/utils.c
similarity index 99%
rename from vtm/jni/gl/utils.c
rename to jni/gl/utils.c
index 354d43af..ce0bcaf1 100644
--- a/vtm/jni/gl/utils.c
+++ b/jni/gl/utils.c
@@ -8,8 +8,8 @@
 
 #ifndef __WIN32__
 #include <alloca.h>
-#else
-#define alloca(size) __builtin_alloca(size)
+//#else
+//#define alloca(size) __builtin_alloca(size)
 #endif
 
 //#ifndef uintptr_t
diff --git a/jni/memcpy_wrap.c b/jni/memcpy_wrap.c
new file mode 100644
index 00000000..70a3021c
--- /dev/null
+++ b/jni/memcpy_wrap.c
@@ -0,0 +1,18 @@
+#ifndef __ANDROID__
+#ifdef __linux__
+#ifdef __x86_64__
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+__asm__(".symver memcpy,memcpy@GLIBC_2.2.5");
+
+void *__wrap_memcpy(void * destination, const void * source, size_t num)
+{
+        return memcpy(destination, source, num);
+}
+
+#endif
+#endif
+#endif
\ No newline at end of file
diff --git a/vtm/jni/tessellate/LICENSE b/jni/tessellate/LICENSE
similarity index 100%
rename from vtm/jni/tessellate/LICENSE
rename to jni/tessellate/LICENSE
diff --git a/vtm/jni/tessellate/Makefile b/jni/tessellate/Makefile
similarity index 100%
rename from vtm/jni/tessellate/Makefile
rename to jni/tessellate/Makefile
diff --git a/vtm/jni/tessellate/README.md b/jni/tessellate/README.md
similarity index 100%
rename from vtm/jni/tessellate/README.md
rename to jni/tessellate/README.md
diff --git a/vtm/jni/tessellate/TessellateJni.c b/jni/tessellate/TessellateJni.c
similarity index 100%
rename from vtm/jni/tessellate/TessellateJni.c
rename to jni/tessellate/TessellateJni.c
diff --git a/vtm/jni/tessellate/dict-list.h b/jni/tessellate/dict-list.h
similarity index 100%
rename from vtm/jni/tessellate/dict-list.h
rename to jni/tessellate/dict-list.h
diff --git a/vtm/jni/tessellate/dict.c b/jni/tessellate/dict.c
similarity index 100%
rename from vtm/jni/tessellate/dict.c
rename to jni/tessellate/dict.c
diff --git a/vtm/jni/tessellate/dict.h b/jni/tessellate/dict.h
similarity index 100%
rename from vtm/jni/tessellate/dict.h
rename to jni/tessellate/dict.h
diff --git a/vtm/jni/tessellate/geom.c b/jni/tessellate/geom.c
similarity index 100%
rename from vtm/jni/tessellate/geom.c
rename to jni/tessellate/geom.c
diff --git a/vtm/jni/tessellate/geom.h b/jni/tessellate/geom.h
similarity index 100%
rename from vtm/jni/tessellate/geom.h
rename to jni/tessellate/geom.h
diff --git a/vtm/jni/tessellate/glu.h b/jni/tessellate/glu.h
similarity index 100%
rename from vtm/jni/tessellate/glu.h
rename to jni/tessellate/glu.h
diff --git a/vtm/jni/tessellate/gluos.h b/jni/tessellate/gluos.h
similarity index 100%
rename from vtm/jni/tessellate/gluos.h
rename to jni/tessellate/gluos.h
diff --git a/vtm/jni/tessellate/main.c b/jni/tessellate/main.c
similarity index 100%
rename from vtm/jni/tessellate/main.c
rename to jni/tessellate/main.c
diff --git a/vtm/jni/tessellate/memalloc.c b/jni/tessellate/memalloc.c
similarity index 100%
rename from vtm/jni/tessellate/memalloc.c
rename to jni/tessellate/memalloc.c
diff --git a/vtm/jni/tessellate/memalloc.h b/jni/tessellate/memalloc.h
similarity index 100%
rename from vtm/jni/tessellate/memalloc.h
rename to jni/tessellate/memalloc.h
diff --git a/vtm/jni/tessellate/mesh.c b/jni/tessellate/mesh.c
similarity index 100%
rename from vtm/jni/tessellate/mesh.c
rename to jni/tessellate/mesh.c
diff --git a/vtm/jni/tessellate/mesh.h b/jni/tessellate/mesh.h
similarity index 100%
rename from vtm/jni/tessellate/mesh.h
rename to jni/tessellate/mesh.h
diff --git a/vtm/jni/tessellate/normal.c b/jni/tessellate/normal.c
similarity index 100%
rename from vtm/jni/tessellate/normal.c
rename to jni/tessellate/normal.c
diff --git a/vtm/jni/tessellate/normal.h b/jni/tessellate/normal.h
similarity index 100%
rename from vtm/jni/tessellate/normal.h
rename to jni/tessellate/normal.h
diff --git a/vtm/jni/tessellate/priorityq-heap.c b/jni/tessellate/priorityq-heap.c
similarity index 100%
rename from vtm/jni/tessellate/priorityq-heap.c
rename to jni/tessellate/priorityq-heap.c
diff --git a/vtm/jni/tessellate/priorityq-heap.h b/jni/tessellate/priorityq-heap.h
similarity index 100%
rename from vtm/jni/tessellate/priorityq-heap.h
rename to jni/tessellate/priorityq-heap.h
diff --git a/vtm/jni/tessellate/priorityq-sort.h b/jni/tessellate/priorityq-sort.h
similarity index 100%
rename from vtm/jni/tessellate/priorityq-sort.h
rename to jni/tessellate/priorityq-sort.h
diff --git a/vtm/jni/tessellate/priorityq.c b/jni/tessellate/priorityq.c
similarity index 100%
rename from vtm/jni/tessellate/priorityq.c
rename to jni/tessellate/priorityq.c
diff --git a/vtm/jni/tessellate/priorityq.h b/jni/tessellate/priorityq.h
similarity index 100%
rename from vtm/jni/tessellate/priorityq.h
rename to jni/tessellate/priorityq.h
diff --git a/vtm/jni/tessellate/render.c b/jni/tessellate/render.c
similarity index 100%
rename from vtm/jni/tessellate/render.c
rename to jni/tessellate/render.c
diff --git a/vtm/jni/tessellate/render.h b/jni/tessellate/render.h
similarity index 100%
rename from vtm/jni/tessellate/render.h
rename to jni/tessellate/render.h
diff --git a/vtm/jni/tessellate/sweep.c b/jni/tessellate/sweep.c
similarity index 100%
rename from vtm/jni/tessellate/sweep.c
rename to jni/tessellate/sweep.c
diff --git a/vtm/jni/tessellate/sweep.h b/jni/tessellate/sweep.h
similarity index 100%
rename from vtm/jni/tessellate/sweep.h
rename to jni/tessellate/sweep.h
diff --git a/vtm/jni/tessellate/tess.c b/jni/tessellate/tess.c
similarity index 100%
rename from vtm/jni/tessellate/tess.c
rename to jni/tessellate/tess.c
diff --git a/vtm/jni/tessellate/tess.h b/jni/tessellate/tess.h
similarity index 100%
rename from vtm/jni/tessellate/tess.h
rename to jni/tessellate/tess.h
diff --git a/vtm/jni/tessellate/tessellate.c b/jni/tessellate/tessellate.c
similarity index 100%
rename from vtm/jni/tessellate/tessellate.c
rename to jni/tessellate/tessellate.c
diff --git a/vtm/jni/tessellate/tessellate.h b/jni/tessellate/tessellate.h
similarity index 100%
rename from vtm/jni/tessellate/tessellate.h
rename to jni/tessellate/tessellate.h
diff --git a/vtm/jni/tessellate/tessmono.c b/jni/tessellate/tessmono.c
similarity index 100%
rename from vtm/jni/tessellate/tessmono.c
rename to jni/tessellate/tessmono.c
diff --git a/vtm/jni/tessellate/tessmono.h b/jni/tessellate/tessmono.h
similarity index 100%
rename from vtm/jni/tessellate/tessmono.h
rename to jni/tessellate/tessmono.h