contribs: moved to contribs dir, added as submodules

Signed-off-by: Steven Noonan <steven@uplinklabs.net>

4 files changed, 82 insertions, 82 deletions

diff --git a/crawl-ref/source/MSVC/crawl.vcproj b/crawl-ref/source/MSVC/crawl.vcproj
index b93b357894..fd2a1327e7 100644
--- a/crawl-ref/source/MSVC/crawl.vcproj
+++ b/crawl-ref/source/MSVC/crawl.vcproj
@@ -41,7 +41,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

-				AdditionalIncludeDirectories=".;..;../util/lua/src;../util/sqlite;../util/pcre;../rltiles"

+				AdditionalIncludeDirectories=".;..;../contrib/lua/src;../contrib/sqlite;../contrib/pcre;../rltiles"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;YY_NO_UNISTD_H;_USE_MATH_DEFINES"

 				MinimalRebuild="true"

 				BasicRuntimeChecks="3"

@@ -118,7 +118,7 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				AdditionalIncludeDirectories=".;..;../util/lua/src;../util/sqlite;../util/pcre;../rltiles"

+				AdditionalIncludeDirectories=".;..;../contrib/lua/src;../contrib/sqlite;../contrib/pcre;../rltiles"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;YY_NO_UNISTD_H;_USE_MATH_DEFINES"

 				UsePrecompiledHeader="2"

 				PrecompiledHeaderThrough="AppHdr.h"

@@ -196,7 +196,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

-				AdditionalIncludeDirectories=".;..;../util/lua/src;../util/sqlite;../util/pcre;../rltiles"

+				AdditionalIncludeDirectories=".;..;../contrib/lua/src;../contrib/sqlite;../contrib/pcre;../rltiles"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;YY_NO_UNISTD_H;_USE_MATH_DEFINES"

 				MinimalRebuild="true"

 				BasicRuntimeChecks="3"

@@ -273,7 +273,7 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				AdditionalIncludeDirectories=".;..;../util/lua/src;../util/sqlite;../util/pcre;../rltiles"

+				AdditionalIncludeDirectories=".;..;../contrib/lua/src;../contrib/sqlite;../contrib/pcre;../rltiles"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;YY_NO_UNISTD_H;_USE_MATH_DEFINES"

 				UsePrecompiledHeader="2"

 				PrecompiledHeaderThrough="AppHdr.h"

diff --git a/crawl-ref/source/MSVC/lua.vcproj b/crawl-ref/source/MSVC/lua.vcproj
index 0f9e53a8c3..973087193f 100644
--- a/crawl-ref/source/MSVC/lua.vcproj
+++ b/crawl-ref/source/MSVC/lua.vcproj
@@ -138,215 +138,215 @@
 	</References>

 	<Files>

 		<File

-			RelativePath="..\util\lua\src\lapi.c"

+			RelativePath="..\contrib\lua\src\lapi.c"
 			>

 		</File>

 		<File

-			RelativePath="..\util\lua\src\lapi.h"

+			RelativePath="..\contrib\lua\src\lapi.h"
 			>

 		</File>

 		<File

-			RelativePath="..\util\lua\src\lauxlib.c"

+			RelativePath="..\contrib\lua\src\lauxlib.c"
 			>

 		</File>

 		<File

-			RelativePath="..\util\lua\src\lauxlib.h"

+			RelativePath="..\contrib\lua\src\lauxlib.h"
 			>

 		</File>

 		<File

-			RelativePath="..\util\lua\src\lbaselib.c"

+			RelativePath="..\contrib\lua\src\lbaselib.c"
 			>

 		</File>

 		<File

-			RelativePath="..\util\lua\src\lcode.c"

+			RelativePath="..\contrib\lua\src\lcode.c"
 			>

 		</File>

 		<File

-			RelativePath="..\util\lua\src\lcode.h"

+			RelativePath="..\contrib\lua\src\lcode.h"
 			>

 		</File>

 		<File

-			RelativePath="..\util\lua\src\ldblib.c"

+			RelativePath="..\contrib\lua\src\ldblib.c"
 			>

 		</File>

 		<File

-			RelativePath="..\util\lua\src\ldebug.c"

+			RelativePath="..\contrib\lua\src\ldebug.c"
 			>

 		</File>

 		<File

-			RelativePath="..\util\lua\src\ldebug.h"

+			RelativePath="..\contrib\lua\src\ldebug.h"
 			>

 		</File>

 		<File

-			RelativePath="..\util\lua\src\ldo.c"

+			RelativePath="..\contrib\lua\src\ldo.c"
 			>

 		</File>

 		<File

-			RelativePath="..\util\lua\src\ldo.h"

+			RelativePath="..\contrib\lua\src\ldo.h"
 			>

 		</File>

 		<File

-			RelativePath="..\util\lua\src\ldump.c"

+			RelativePath="..\contrib\lua\src\ldump.c"
 			>

 		</File>

 		<File

-			RelativePath="..\util\lua\src\lfunc.c"

+			RelativePath="..\contrib\lua\src\lfunc.c"
 			>

 		</File>

 		<File

-			RelativePath="..\util\lua\src\lfunc.h"

+			RelativePath="..\contrib\lua\src\lfunc.h"
 			>

 		</File>

 		<File

-			RelativePath="..\util\lua\src\lgc.c"

+			RelativePath="..\contrib\lua\src\lgc.c"
 			>

 		</File>

 		<File

-			RelativePath="..\util\lua\src\lgc.h"

+			RelativePath="..\contrib\lua\src\lgc.h"
 			>

 		</File>

 		<File

-			RelativePath="..\util\lua\src\linit.c"

+			RelativePath="..\contrib\lua\src\linit.c"
 			>

 		</File>

 		<File

-			RelativePath="..\util\lua\src\liolib.c"

+			RelativePath="..\contrib\lua\src\liolib.c"
 			>

 		</File>

 		<File

-			RelativePath="..\util\lua\src\llex.c"

+			RelativePath="..\contrib\lua\src\llex.c"
 			>

 		</File>

 		<File

-			RelativePath="..\util\lua\src\llex.h"

+			RelativePath="..\contrib\lua\src\llex.h"
 			>

 		</File>

 		<File

-			RelativePath="..\util\lua\src\llimits.h"

+			RelativePath="..\contrib\lua\src\llimits.h"
 			>

 		</File>

 		<File

-			RelativePath="..\util\lua\src\lmathlib.c"

+			RelativePath="..\contrib\lua\src\lmathlib.c"
 			>

 		</File>

 		<File

-			RelativePath="..\util\lua\src\lmem.c"

+			RelativePath="..\contrib\lua\src\lmem.c"
 			>

 		</File>

 		<File

-			RelativePath="..\util\lua\src\lmem.h"

+			RelativePath="..\contrib\lua\src\lmem.h"
 			>

 		</File>

 		<File

-			RelativePath="..\util\lua\src\loadlib.c"

+			RelativePath="..\contrib\lua\src\loadlib.c"
 			>

 		</File>

 		<File

-			RelativePath="..\util\lua\src\lobject.c"

+			RelativePath="..\contrib\lua\src\lobject.c"
 			>

 		</File>

 		<File

-			RelativePath="..\util\lua\src\lobject.h"

+			RelativePath="..\contrib\lua\src\lobject.h"
 			>

 		</File>

 		<File

-			RelativePath="..\util\lua\src\lopcodes.c"

+			RelativePath="..\contrib\lua\src\lopcodes.c"
 			>

 		</File>

 		<File

-			RelativePath="..\util\lua\src\lopcodes.h"

+			RelativePath="..\contrib\lua\src\lopcodes.h"
 			>

 		</File>

 		<File

-			RelativePath="..\util\lua\src\loslib.c"

+			RelativePath="..\contrib\lua\src\loslib.c"
 			>

 		</File>

 		<File

-			RelativePath="..\util\lua\src\lparser.c"

+			RelativePath="..\contrib\lua\src\lparser.c"
 			>

 		</File>

 		<File

-			RelativePath="..\util\lua\src\lparser.h"

+			RelativePath="..\contrib\lua\src\lparser.h"
 			>

 		</File>

 		<File

-			RelativePath="..\util\lua\src\lstate.c"

+			RelativePath="..\contrib\lua\src\lstate.c"
 			>

 		</File>

 		<File

-			RelativePath="..\util\lua\src\lstate.h"

+			RelativePath="..\contrib\lua\src\lstate.h"
 			>

 		</File>

 		<File

-			RelativePath="..\util\lua\src\lstring.c"

+			RelativePath="..\contrib\lua\src\lstring.c"
 			>

 		</File>

 		<File

-			RelativePath="..\util\lua\src\lstring.h"

+			RelativePath="..\contrib\lua\src\lstring.h"
 			>

 		</File>

 		<File

-			RelativePath="..\util\lua\src\lstrlib.c"

+			RelativePath="..\contrib\lua\src\lstrlib.c"
 			>

 		</File>

 		<File

-			RelativePath="..\util\lua\src\ltable.c"

+			RelativePath="..\contrib\lua\src\ltable.c"
 			>

 		</File>

 		<File

-			RelativePath="..\util\lua\src\ltable.h"

+			RelativePath="..\contrib\lua\src\ltable.h"
 			>

 		</File>

 		<File

-			RelativePath="..\util\lua\src\ltablib.c"

+			RelativePath="..\contrib\lua\src\ltablib.c"
 			>

 		</File>

 		<File

-			RelativePath="..\util\lua\src\ltm.c"

+			RelativePath="..\contrib\lua\src\ltm.c"
 			>

 		</File>

 		<File

-			RelativePath="..\util\lua\src\ltm.h"

+			RelativePath="..\contrib\lua\src\ltm.h"
 			>

 		</File>

 		<File

-			RelativePath="..\util\lua\src\lua.h"

+			RelativePath="..\contrib\lua\src\lua.h"
 			>

 		</File>

 		<File

-			RelativePath="..\util\lua\src\luaconf.h"

+			RelativePath="..\contrib\lua\src\luaconf.h"
 			>

 		</File>

 		<File

-			RelativePath="..\util\lua\src\lualib.h"

+			RelativePath="..\contrib\lua\src\lualib.h"
 			>

 		</File>

 		<File

-			RelativePath="..\util\lua\src\lundump.c"

+			RelativePath="..\contrib\lua\src\lundump.c"
 			>

 		</File>

 		<File

-			RelativePath="..\util\lua\src\lundump.h"

+			RelativePath="..\contrib\lua\src\lundump.h"
 			>

 		</File>

 		<File

-			RelativePath="..\util\lua\src\lvm.c"

+			RelativePath="..\contrib\lua\src\lvm.c"
 			>

 		</File>

 		<File

-			RelativePath="..\util\lua\src\lvm.h"

+			RelativePath="..\contrib\lua\src\lvm.h"
 			>

 		</File>

 		<File

-			RelativePath="..\util\lua\src\lzio.c"

+			RelativePath="..\contrib\lua\src\lzio.c"
 			>

 		</File>

 		<File

-			RelativePath="..\util\lua\src\lzio.h"

+			RelativePath="..\contrib\lua\src\lzio.h"
 			>

 		</File>

 		<File

-			RelativePath="..\util\lua\src\print.c"

+			RelativePath="..\contrib\lua\src\print.c"
 			>

 		</File>

 	</Files>

diff --git a/crawl-ref/source/MSVC/pcre.vcproj b/crawl-ref/source/MSVC/pcre.vcproj
index 2bca04c5d8..1f4aa13aaa 100644
--- a/crawl-ref/source/MSVC/pcre.vcproj
+++ b/crawl-ref/source/MSVC/pcre.vcproj
@@ -138,95 +138,95 @@
 	</References>
 	<Files>
 		<File
-			RelativePath="..\util\pcre\pcre.h"
+			RelativePath="..\contrib\pcre\pcre.h"
 			>
 		</File>
 		<File
-			RelativePath="..\util\pcre\pcre_chartables.c"
+			RelativePath="..\contrib\pcre\pcre_chartables.c"
 			>
 		</File>
 		<File
-			RelativePath="..\util\pcre\pcre_compile.c"
+			RelativePath="..\contrib\pcre\pcre_compile.c"
 			>
 		</File>
 		<File
-			RelativePath="..\util\pcre\pcre_config.c"
+			RelativePath="..\contrib\pcre\pcre_config.c"
 			>
 		</File>
 		<File
-			RelativePath="..\util\pcre\pcre_dfa_exec.c"
+			RelativePath="..\contrib\pcre\pcre_dfa_exec.c"
 			>
 		</File>
 		<File
-			RelativePath="..\util\pcre\pcre_exec.c"
+			RelativePath="..\contrib\pcre\pcre_exec.c"
 			>
 		</File>
 		<File
-			RelativePath="..\util\pcre\pcre_fullinfo.c"
+			RelativePath="..\contrib\pcre\pcre_fullinfo.c"
 			>
 		</File>
 		<File
-			RelativePath="..\util\pcre\pcre_get.c"
+			RelativePath="..\contrib\pcre\pcre_get.c"
 			>
 		</File>
 		<File
-			RelativePath="..\util\pcre\pcre_globals.c"
+			RelativePath="..\contrib\pcre\pcre_globals.c"
 			>
 		</File>
 		<File
-			RelativePath="..\util\pcre\pcre_info.c"
+			RelativePath="..\contrib\pcre\pcre_info.c"
 			>
 		</File>
 		<File
-			RelativePath="..\util\pcre\pcre_internal.h"
+			RelativePath="..\contrib\pcre\pcre_internal.h"
 			>
 		</File>
 		<File
-			RelativePath="..\util\pcre\pcre_maketables.c"
+			RelativePath="..\contrib\pcre\pcre_maketables.c"
 			>
 		</File>
 		<File
-			RelativePath="..\util\pcre\pcre_newline.c"
+			RelativePath="..\contrib\pcre\pcre_newline.c"
 			>
 		</File>
 		<File
-			RelativePath="..\util\pcre\pcre_ord2utf8.c"
+			RelativePath="..\contrib\pcre\pcre_ord2utf8.c"
 			>
 		</File>
 		<File
-			RelativePath="..\util\pcre\pcre_refcount.c"
+			RelativePath="..\contrib\pcre\pcre_refcount.c"
 			>
 		</File>
 		<File
-			RelativePath="..\util\pcre\pcre_scanner.h"
+			RelativePath="..\contrib\pcre\pcre_scanner.h"
 			>
 		</File>
 		<File
-			RelativePath="..\util\pcre\pcre_study.c"
+			RelativePath="..\contrib\pcre\pcre_study.c"
 			>
 		</File>
 		<File
-			RelativePath="..\util\pcre\pcre_tables.c"
+			RelativePath="..\contrib\pcre\pcre_tables.c"
 			>
 		</File>
 		<File
-			RelativePath="..\util\pcre\pcre_try_flipped.c"
+			RelativePath="..\contrib\pcre\pcre_try_flipped.c"
 			>
 		</File>
 		<File
-			RelativePath="..\util\pcre\pcre_ucp_searchfuncs.c"
+			RelativePath="..\contrib\pcre\pcre_ucp_searchfuncs.c"
 			>
 		</File>
 		<File
-			RelativePath="..\util\pcre\pcre_valid_utf8.c"
+			RelativePath="..\contrib\pcre\pcre_valid_utf8.c"
 			>
 		</File>
 		<File
-			RelativePath="..\util\pcre\pcre_version.c"
+			RelativePath="..\contrib\pcre\pcre_version.c"
 			>
 		</File>
 		<File
-			RelativePath="..\util\pcre\pcre_xclass.c"
+			RelativePath="..\contrib\pcre\pcre_xclass.c"
 			>
 		</File>
 	</Files>
diff --git a/crawl-ref/source/MSVC/sqlite.vcproj b/crawl-ref/source/MSVC/sqlite.vcproj
index 72f023ad76..0d3c3a4410 100644
--- a/crawl-ref/source/MSVC/sqlite.vcproj
+++ b/crawl-ref/source/MSVC/sqlite.vcproj
@@ -138,11 +138,11 @@
 	</References>
 	<Files>
 		<File
-			RelativePath="..\util\sqlite\sqlite3.c"
+			RelativePath="..\contrib\sqlite\sqlite3.c"
 			>
 		</File>
 		<File
-			RelativePath="..\util\sqlite\sqlite3.h"
+			RelativePath="..\contrib\sqlite\sqlite3.h"
 			>
 		</File>
 	</Files>