From 429f9bac868b8b83409538280511c41f4564536b Mon Sep 17 00:00:00 2001
From: Joshua Granick <jgranick@users.noreply.github.com>
Date: Tue, 8 Jul 2014 11:04:41 -0700
Subject: [PATCH] Add JPEG and PNG libs

---
 .gitmodules       | 6 ++++++
 project/Build.xml | 8 +++++++-
 project/lib/jpeg  | 1 +
 project/lib/png   | 1 +
 4 files changed, 15 insertions(+), 1 deletion(-)
 create mode 160000 project/lib/jpeg
 create mode 160000 project/lib/png

diff --git a/.gitmodules b/.gitmodules
index c30e30f9d..0932f9efc 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -19,3 +19,9 @@
 [submodule "project/lib/neko"]
 	path = project/lib/neko
 	url = https://github.com/native-toolkit/neko
+[submodule "project/lib/png"]
+	path = project/lib/png
+	url = https://github.com/native-toolkit/png
+[submodule "project/lib/jpeg"]
+	path = project/lib/jpeg
+	url = https://github.com/native-toolkit/jpeg
diff --git a/project/Build.xml b/project/Build.xml
index 5f7e9aae6..fbf8093e6 100644
--- a/project/Build.xml
+++ b/project/Build.xml
@@ -9,10 +9,12 @@
 	<set name="ios" value="1" if="iphone" />
 	
 	<set name="LIME_CURL" value="1" />
-	<set name="LIME_NEKO" value="1" if="linux" />
+	<set name="LIME_JPEG" value="1" />
+	<!-- <set name="LIME_NEKO" value="1" if="linux" /> -->
 	<set name="LIME_OGG" value="1" />
 	<set name="LIME_OPENAL" value="1" />
 	<set name="LIME_OPENGL" value="1" />
+	<set name="LIME_PNG" value="1" />
 	<set name="LIME_SDL" value="1" />
 	<set name="LIME_VORBIS" value="1" />
 	<set name="LIME_ZLIB" value="1" />
@@ -73,9 +75,11 @@
 	</files>
 	
 	<include name="lib/curl/files.xml" />
+	<include name="lib/jpeg/files.xml" />
 	<include name="lib/neko/files.xml" />
 	<include name="lib/ogg/files.xml" />
 	<include name="lib/openal/files.xml" />
+	<include name="lib/png/files.xml" />
 	<include name="lib/sdl/files.xml" />
 	<include name="lib/vorbis/files.xml" />
 	<include name="lib/zlib/files.xml" />
@@ -87,9 +91,11 @@
 		<files id="lime" />
 		
 		<files id="native-toolkit-curl" if="LIME_CURL" />
+		<files id="native-toolkit-jpeg" if="LIME_JPEG" />
 		<files id="native-toolkit-neko" if="LIME_NEKO" />
 		<files id="native-toolkit-ogg" if="LIME_OGG" />
 		<files id="native-toolkit-openal" if="LIME_OPENAL" unless="mac || iphone" />
+		<files id="native-toolkit-png" if="LIME_PNG" />
 		<files id="native-toolkit-sdl" if="LIME_SDL" />
 		<files id="native-toolkit-vorbis" if="LIME_VORBIS" />
 		<files id="native-toolkit-zlib" if="LIME_ZLIB" />
diff --git a/project/lib/jpeg b/project/lib/jpeg
new file mode 160000
index 000000000..937b86500
--- /dev/null
+++ b/project/lib/jpeg
@@ -0,0 +1 @@
+Subproject commit 937b86500b2cd436a38d7f9906968f3d0f6d8bea
diff --git a/project/lib/png b/project/lib/png
new file mode 160000
index 000000000..456bc0cf6
--- /dev/null
+++ b/project/lib/png
@@ -0,0 +1 @@
+Subproject commit 456bc0cf64305b5394e9c65dfc5a7a8f2afb6045