From 81d34f8feaf1fb40d3a05b7f46a2043c58e9889f Mon Sep 17 00:00:00 2001
From: Joshua Granick <jgranick@users.noreply.github.com>
Date: Tue, 17 Jun 2014 17:20:09 -0700
Subject: [PATCH] Name changes

---
 project/Build.xml  | 36 ++++++++++++++++++------------------
 project/lib/curl   |  2 +-
 project/lib/ogg    |  2 +-
 project/lib/openal |  2 +-
 project/lib/sdl    |  2 +-
 project/lib/vorbis |  2 +-
 project/lib/zlib   |  2 +-
 7 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/project/Build.xml b/project/Build.xml
index c4ef366ce..38cf8e282 100644
--- a/project/Build.xml
+++ b/project/Build.xml
@@ -17,7 +17,7 @@
 	<set name="LIME_ZLIB" value="1" />
 	
 	<set name="OUTPUT_DIR" value="../ndll" unless="OUTPUT_DIR" />
-	<set name="NATIVE_LIB_PATH" value="lib" unless="NATIVE_LIB_PATH" />
+	<set name="NATIVE_TOOLKIT_PATH" value="lib" unless="NATIVE_TOOLKIT_PATH" />
 	
 	<set name="LIBCURL_SSL" value="1" />
 	
@@ -30,11 +30,11 @@
 		
 		<section if="LIME_SDL">
 			
-			<compilerflag value="-I${NATIVE_LIB_PATH}/sdl/include/" />
-			<compilerflag value="-I${NATIVE_LIB_PATH}/sdl/include/configs/default/" unless="windows || mac || linux"/>
-			<compilerflag value="-I${NATIVE_LIB_PATH}/sdl/include/configs/linux/" if="linux"/>
-			<compilerflag value="-I${NATIVE_LIB_PATH}/sdl/include/configs/windows/" if="windows"/>
-			<compilerflag value="-I${NATIVE_LIB_PATH}/sdl/include/configs/mac/" if="mac"/>
+			<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/sdl/include/" />
+			<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/sdl/include/configs/default/" unless="windows || mac || linux"/>
+			<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/sdl/include/configs/linux/" if="linux"/>
+			<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/sdl/include/configs/windows/" if="windows"/>
+			<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/sdl/include/configs/mac/" if="mac"/>
 			
 			<file name="src/backend/sdl/SDLApplication.cpp" />
 			<file name="src/backend/sdl/SDLWindow.cpp" />
@@ -60,12 +60,12 @@
 		
 	</files>
 	
-	<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/zlib/include.xml" />
+	<include name="lib/curl/files.xml" />
+	<include name="lib/ogg/files.xml" />
+	<include name="lib/openal/files.xml" />
+	<include name="lib/sdl/files.xml" />
+	<include name="lib/vorbis/files.xml" />
+	<include name="lib/zlib/files.xml" />
 	
 	<target id="lime" output="${LIBPREFIX}lime${MSVC_LIB_VERSION}${DEBUGEXTRA}${LIBEXTRA}" tool="linker" toolid="${STD_MODULE_LINK}">
 		
@@ -73,12 +73,12 @@
 		
 		<files id="lime" />
 		
-		<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" />
+		<files id="native-toolkit-curl" if="LIME_CURL" />
+		<files id="native-toolkit-ogg" if="LIME_OGG" />
+		<files id="native-toolkit-openal" if="LIME_OPENAL" unless="mac || iphone" />
+		<files id="native-toolkit-sdl" if="LIME_SDL" />
+		<files id="native-toolkit-vorbis" if="LIME_VORBIS" />
+		<files id="native-toolkit-zlib" if="LIME_ZLIB" />
 		
 		<section unless="static_link">
 			
diff --git a/project/lib/curl b/project/lib/curl
index a4bf20266..96d4700e3 160000
--- a/project/lib/curl
+++ b/project/lib/curl
@@ -1 +1 @@
-Subproject commit a4bf20266ba3082ae27dccece0a30a8830c7bd13
+Subproject commit 96d4700e32543d44062c5453d32d4135c9820960
diff --git a/project/lib/ogg b/project/lib/ogg
index b0764d3d4..e7b4c965f 160000
--- a/project/lib/ogg
+++ b/project/lib/ogg
@@ -1 +1 @@
-Subproject commit b0764d3d483e37abfb4f0f25990842d992bf68a9
+Subproject commit e7b4c965fdda312dc62fe0b831bf6475c1a666f3
diff --git a/project/lib/openal b/project/lib/openal
index 70448f8ab..1367752d2 160000
--- a/project/lib/openal
+++ b/project/lib/openal
@@ -1 +1 @@
-Subproject commit 70448f8abe3a1e82c347b4bc704c630497cddfa7
+Subproject commit 1367752d26f0dd83c3672ee0904d513b892ee4eb
diff --git a/project/lib/sdl b/project/lib/sdl
index 0bd41e2b5..c3405178a 160000
--- a/project/lib/sdl
+++ b/project/lib/sdl
@@ -1 +1 @@
-Subproject commit 0bd41e2b5820428cf43385ca6a4b93f689eb842e
+Subproject commit c3405178a2f00aa6cfff6a2edd4bffadfc667895
diff --git a/project/lib/vorbis b/project/lib/vorbis
index 7c65f7df9..44d0e5bbe 160000
--- a/project/lib/vorbis
+++ b/project/lib/vorbis
@@ -1 +1 @@
-Subproject commit 7c65f7df9f5bbf1f4b70d1b71a3e49b6798ee852
+Subproject commit 44d0e5bbe25e5bc3d5d92d46a5457dfce6efab62
diff --git a/project/lib/zlib b/project/lib/zlib
index 571b34221..ea694cde2 160000
--- a/project/lib/zlib
+++ b/project/lib/zlib
@@ -1 +1 @@
-Subproject commit 571b342212bbab0bf2e8afd1611e6c2eb34f894d
+Subproject commit ea694cde22f7133216504024ad83c12a235a9423