Rearranging project structure

andynicholson · Jul 20, 2011 · 9c10900 · 9c10900
1 parent 57cfaa8
commit 9c10900
Show file tree

Hide file tree

Showing 20 changed files with 48 additions and 2 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,6 +1,6 @@
 [submodule "x264"]
-	path = jni/x264
+	path = Project/jni/x264
 	url = git://git.videolan.org/x264.git
 [submodule "ffmpeg"]
-	path = jni/ffmpeg
+	path = Project/jni/ffmpeg
 	url = git://git.videolan.org/ffmpeg.git
diff --git a/Project/.gitignore b/Project/.gitignore
@@ -0,0 +1,4 @@
+bin
+gen
+libs
+obj
diff --git a/Project/build.xml b/Project/build.xml
@@ -76,4 +76,14 @@
     -->
     <setup />
 
+    <target name="jni" depends="compile">
+      <exec executable="javah">
+        <arg value="-classpath" />
+        <arg value="bin/classes" />
+        <arg value="-d" />
+        <arg value="jni/videokit/" />
+        <arg value="uk.co.halfninja.videokit.Videokit" />  
+      </exec>
+    </target>
+
 </project>
diff --git a/init-submodules.sh → Project/init-submodules.sh b/init-submodules.sh → Project/init-submodules.sh
diff --git a/jni/.gitignore → Project/jni/.gitignore b/jni/.gitignore → Project/jni/.gitignore
diff --git a/jni/Android.mk → Project/jni/Android.mk b/jni/Android.mk → Project/jni/Android.mk
diff --git a/jni/config_make_everything.sh → Project/jni/config_make_everything.sh b/jni/config_make_everything.sh → Project/jni/config_make_everything.sh
diff --git a/jni/configure_ffmpeg.sh → Project/jni/configure_ffmpeg.sh b/jni/configure_ffmpeg.sh → Project/jni/configure_ffmpeg.sh
diff --git a/jni/configure_x264.sh → Project/jni/configure_x264.sh b/jni/configure_x264.sh → Project/jni/configure_x264.sh
diff --git a/jni/create_toolchain.sh → Project/jni/create_toolchain.sh b/jni/create_toolchain.sh → Project/jni/create_toolchain.sh
diff --git a/jni/ffmpeg → Project/jni/ffmpeg b/jni/ffmpeg → Project/jni/ffmpeg
diff --git a/jni/make_ffmpeg.sh → Project/jni/make_ffmpeg.sh b/jni/make_ffmpeg.sh → Project/jni/make_ffmpeg.sh
diff --git a/jni/make_x264.sh → Project/jni/make_x264.sh b/jni/make_x264.sh → Project/jni/make_x264.sh
diff --git a/jni/settings.sh → Project/jni/settings.sh b/jni/settings.sh → Project/jni/settings.sh
diff --git a/jni/videokit/jni_interface.c → Project/jni/videokit/jni_interface.c b/jni/videokit/jni_interface.c → Project/jni/videokit/jni_interface.c
diff --git a/jni/videokit/jni_interface.h → Project/jni/videokit/jni_interface.h b/jni/videokit/jni_interface.h → Project/jni/videokit/jni_interface.h
diff --git a/Project/jni/videokit/uk_co_halfninja_videokit_Videokit.h b/Project/jni/videokit/uk_co_halfninja_videokit_Videokit.h
diff --git a/jni/x264 → Project/jni/x264 b/jni/x264 → Project/jni/x264
diff --git a/Project/src/uk/co/halfninja/videokit/Videokit.java b/Project/src/uk/co/halfninja/videokit/Videokit.java
@@ -0,0 +1,7 @@
+package uk.co.halfninja.videokit;
+
+public final class Videokit {
+
+  public native void run(String[] args);
+
+}
diff --git a/ProjectTest/.gitignore b/ProjectTest/.gitignore
@@ -0,0 +1,4 @@
+bin
+gen
+libs
+obj