From d1679525e9fce0f4398c87cc28d573a0d953cb07 Mon Sep 17 00:00:00 2001
From: Joshua Granick <jgranick@users.noreply.github.com>
Date: Thu, 5 Jun 2014 22:37:09 -0700
Subject: [PATCH] Update build

---
 .gitmodules        | 21 +++++++++------------
 project/Build.xml  | 22 +++++++++++-----------
 project/lib/al     |  1 -
 project/lib/curl   |  2 +-
 project/lib/ogg    |  2 +-
 project/lib/openal |  1 +
 project/lib/sdl    |  2 +-
 project/lib/vorbis |  2 +-
 project/lib/z      |  1 -
 project/lib/zlib   |  1 +
 10 files changed, 26 insertions(+), 29 deletions(-)
 delete mode 160000 project/lib/al
 create mode 160000 project/lib/openal
 delete mode 160000 project/lib/z
 create mode 160000 project/lib/zlib

diff --git a/.gitmodules b/.gitmodules
index c0e038db2..3f8e8a159 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,21 +1,18 @@
 [submodule "project/lib/vorbis"]
 	path = project/lib/vorbis
-	url = https://github.com/openfl/libvorbis
+	url = https://github.com/openfl/native-vorbis
 [submodule "project/lib/sdl"]
 	path = project/lib/sdl
-	url = https://github.com/openfl/libsdl
+	url = https://github.com/openfl/native-sdl
 [submodule "project/lib/openal"]
-	path = project/lib/al/
-	url = https://github.com/openfl/libal
+	path = project/lib/openal/
+	url = https://github.com/openfl/native-openal
 [submodule "project/lib/curl"]
 	path = project/lib/curl
-	url = https://github.com/openfl/libcurl
+	url = https://github.com/openfl/native-curl
 [submodule "project/lib/ogg"]
 	path = project/lib/ogg
-	url = https://github.com/openfl/libogg
-[submodule "project/lib/z"]
-	path = project/lib/z
-	url = https://github.com/openfl/libz
-[submodule "project/lib/al"]
-	path = project/lib/al
-	url = https://github.com/openfl/libal
+	url = https://github.com/openfl/native-ogg
+[submodule "project/lib/zlib"]
+	path = project/lib/zlib
+	url = https://github.com/openfl/native-zlib
diff --git a/project/Build.xml b/project/Build.xml
index 0a685a6c7..097c1bf25 100644
--- a/project/Build.xml
+++ b/project/Build.xml
@@ -16,28 +16,28 @@
 	<set name="LIME_VORBIS" value="1" />
 	<set name="LIME_ZLIB" value="1" />
 	
-	<set name="OUT_DIR" value="../ndll" unless="OUT_DIR" />
-	<set name="LIB_PREFIX" value="lib" unless="LIB_PREFIX" />
+	<set name="OUTPUT_DIR" value="../ndll" unless="OUTPUT_DIR" />
+	<set name="NATIVE_LIB_PATH" value="lib" unless="NATIVE_LIB_PATH" />
 	
 	<set name="LIBCURL_SSL" value="1" />
 	
-	<include name="lib/al/include.xml" />
 	<include name="lib/curl/include.xml" />
 	<include name="lib/ogg/include.xml" />
+	<include name="lib/openal/include.xml" />
 	<include name="lib/sdl/include.xml" />
 	<include name="lib/vorbis/include.xml" />
-	<include name="lib/z/include.xml" />
+	<include name="lib/zlib/include.xml" />
 	
 	<target id="lime" output="${LIBPREFIX}lime${MSVC_LIB_VERSION}${DEBUGEXTRA}${LIBEXTRA}" tool="linker" toolid="${STD_MODULE_LINK}">
 		
-		<outdir name="${OUT_DIR}/${BINDIR}" />
+		<outdir name="${OUTPUT_DIR}/${BINDIR}" />
 		
-		<files id="libal" if="LIME_OPENAL" unless="mac || iphone" />
-		<files id="libcurl" if="LIME_CURL" />
-		<files id="libogg" if="LIME_OGG" />
-		<files id="libsdl" if="LIME_SDL" />
-		<files id="libvorbis" if="LIME_VORBIS" />
-		<files id="libz" if="LIME_ZLIB" />
+		<files id="native-curl" if="LIME_CURL" />
+		<files id="native-ogg" if="LIME_OGG" />
+		<files id="native-openal" if="LIME_OPENAL" unless="mac || iphone" />
+		<files id="native-sdl" if="LIME_SDL" />
+		<files id="native-vorbis" if="LIME_VORBIS" />
+		<files id="native-zlib" if="LIME_ZLIB" />
 		
 		<section unless="static_link">
 			
diff --git a/project/lib/al b/project/lib/al
deleted file mode 160000
index bdb8d26fa..000000000
--- a/project/lib/al
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit bdb8d26fae03cd6f0e56f0cf96f6c777701f6811
diff --git a/project/lib/curl b/project/lib/curl
index 191f304d5..a4bf20266 160000
--- a/project/lib/curl
+++ b/project/lib/curl
@@ -1 +1 @@
-Subproject commit 191f304d537dca11c747bd1726418ea00a8173ff
+Subproject commit a4bf20266ba3082ae27dccece0a30a8830c7bd13
diff --git a/project/lib/ogg b/project/lib/ogg
index 231daccfc..2c6a7c4f9 160000
--- a/project/lib/ogg
+++ b/project/lib/ogg
@@ -1 +1 @@
-Subproject commit 231daccfc98dcd316643ae4235ccaf9c7c39d6aa
+Subproject commit 2c6a7c4f9448a38f2423a890ab9aeffdac4445cc
diff --git a/project/lib/openal b/project/lib/openal
new file mode 160000
index 000000000..70448f8ab
--- /dev/null
+++ b/project/lib/openal
@@ -0,0 +1 @@
+Subproject commit 70448f8abe3a1e82c347b4bc704c630497cddfa7
diff --git a/project/lib/sdl b/project/lib/sdl
index 0f03ae66e..84b262e9c 160000
--- a/project/lib/sdl
+++ b/project/lib/sdl
@@ -1 +1 @@
-Subproject commit 0f03ae66e4f368ed44b0d2a24da910dcd8939ea0
+Subproject commit 84b262e9c34142591705c5cb7fca427cb9060a23
diff --git a/project/lib/vorbis b/project/lib/vorbis
index f218700ca..7fff92ffc 160000
--- a/project/lib/vorbis
+++ b/project/lib/vorbis
@@ -1 +1 @@
-Subproject commit f218700ca617e5fdbd31819c0d6019308cb23963
+Subproject commit 7fff92ffc9a16181317b23841704c19eafa6181f
diff --git a/project/lib/z b/project/lib/z
deleted file mode 160000
index f3a6fc3f4..000000000
--- a/project/lib/z
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit f3a6fc3f47ff4aa4525a665e907981acc9d5cdce
diff --git a/project/lib/zlib b/project/lib/zlib
new file mode 160000
index 000000000..5b65f3300
--- /dev/null
+++ b/project/lib/zlib
@@ -0,0 +1 @@
+Subproject commit 5b65f3300ce8e2d5c2092e82c36773453c0f9bd7