diff options
author | Steven Noonan <steven@uplinklabs.net> | 2009-10-15 09:33:08 -0700 |
---|---|---|
committer | Steven Noonan <steven@uplinklabs.net> | 2009-10-15 09:34:14 -0700 |
commit | 1a2749448dcaae0b9802953dbf6815462fc7b2cc (patch) | |
tree | c9505e2cc03761f26e58ecdab919665678d2f31e /crawl-ref/source/MSVC | |
parent | 5a1a72cee67593ac6061a736fd64a756eb8d3c7b (diff) | |
download | crawl-ref-1a2749448dcaae0b9802953dbf6815462fc7b2cc.tar.gz crawl-ref-1a2749448dcaae0b9802953dbf6815462fc7b2cc.zip |
MSVC: move contrib projects to contrib, fix some compile errors
Signed-off-by: Steven Noonan <steven@uplinklabs.net>
Diffstat (limited to 'crawl-ref/source/MSVC')
-rw-r--r-- | crawl-ref/source/MSVC/crawl-ref.sln | 6 | ||||
-rw-r--r-- | crawl-ref/source/MSVC/crawl.vcproj | 8 | ||||
-rw-r--r-- | crawl-ref/source/MSVC/lua.vcproj | 355 | ||||
-rw-r--r-- | crawl-ref/source/MSVC/pcre.vcproj | 235 | ||||
-rw-r--r-- | crawl-ref/source/MSVC/sqlite.vcproj | 151 |
5 files changed, 11 insertions, 744 deletions
diff --git a/crawl-ref/source/MSVC/crawl-ref.sln b/crawl-ref/source/MSVC/crawl-ref.sln index 5dcc570d71..6f36d961b8 100644 --- a/crawl-ref/source/MSVC/crawl-ref.sln +++ b/crawl-ref/source/MSVC/crawl-ref.sln @@ -9,11 +9,11 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "crawl", "crawl.vcproj", "{3 {A0FDC72E-0BE5-4542-B381-6A482DAC2125} = {A0FDC72E-0BE5-4542-B381-6A482DAC2125}
EndProjectSection
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lua", "lua.vcproj", "{A61349B6-4099-4688-AA1A-00D91397857D}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lua", "..\contrib\lua\src\lua.vcproj", "{A61349B6-4099-4688-AA1A-00D91397857D}" EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sqlite", "sqlite.vcproj", "{5783572B-479A-4EE8-8F16-1FDB24DDD1A0}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sqlite", "..\contrib\sqlite\sqlite.vcproj", "{5783572B-479A-4EE8-8F16-1FDB24DDD1A0}" EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pcre", "pcre.vcproj", "{A0FDC72E-0BE5-4542-B381-6A482DAC2125}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pcre", "..\contrib\pcre\pcre.vcproj", "{A0FDC72E-0BE5-4542-B381-6A482DAC2125}" EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tilegen", "tilegen.vcproj", "{DAE92A45-087B-445B-8E94-BA864173A73F}"
EndProject
diff --git a/crawl-ref/source/MSVC/crawl.vcproj b/crawl-ref/source/MSVC/crawl.vcproj index fd2a1327e7..6fcd67d75c 100644 --- a/crawl-ref/source/MSVC/crawl.vcproj +++ b/crawl-ref/source/MSVC/crawl.vcproj @@ -718,6 +718,14 @@ >
</File>
<File
+ RelativePath="..\l_los.cc" + > + </File> + <File + RelativePath="..\l_los.h" + > + </File> + <File RelativePath="..\lev-pand.cc"
>
</File>
diff --git a/crawl-ref/source/MSVC/lua.vcproj b/crawl-ref/source/MSVC/lua.vcproj deleted file mode 100644 index 973087193f..0000000000 --- a/crawl-ref/source/MSVC/lua.vcproj +++ /dev/null @@ -1,355 +0,0 @@ -<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="8.00"
- Name="lua"
- ProjectGUID="{A61349B6-4099-4688-AA1A-00D91397857D}"
- RootNamespace="lua"
- Keyword="Win32Proj"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="Debug|Win32"
- ConfigurationType="4"
- InheritedPropertySheets=".\Common.vsprops;.\Debug.vsprops" - CharacterSet="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS"
- MinimalRebuild="true"
- BasicRuntimeChecks="3"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- Detect64BitPortabilityProblems="true"
- DebugInformationFormat="4"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLibrarianTool"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Release|Win32"
- ConfigurationType="4"
- InheritedPropertySheets=".\Common.vsprops;.\Release.vsprops" - CharacterSet="1"
- WholeProgramOptimization="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- Detect64BitPortabilityProblems="true"
- DebugInformationFormat="3"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLibrarianTool"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <File
- RelativePath="..\contrib\lua\src\lapi.c" - >
- </File>
- <File
- RelativePath="..\contrib\lua\src\lapi.h" - >
- </File>
- <File
- RelativePath="..\contrib\lua\src\lauxlib.c" - >
- </File>
- <File
- RelativePath="..\contrib\lua\src\lauxlib.h" - >
- </File>
- <File
- RelativePath="..\contrib\lua\src\lbaselib.c" - >
- </File>
- <File
- RelativePath="..\contrib\lua\src\lcode.c" - >
- </File>
- <File
- RelativePath="..\contrib\lua\src\lcode.h" - >
- </File>
- <File
- RelativePath="..\contrib\lua\src\ldblib.c" - >
- </File>
- <File
- RelativePath="..\contrib\lua\src\ldebug.c" - >
- </File>
- <File
- RelativePath="..\contrib\lua\src\ldebug.h" - >
- </File>
- <File
- RelativePath="..\contrib\lua\src\ldo.c" - >
- </File>
- <File
- RelativePath="..\contrib\lua\src\ldo.h" - >
- </File>
- <File
- RelativePath="..\contrib\lua\src\ldump.c" - >
- </File>
- <File
- RelativePath="..\contrib\lua\src\lfunc.c" - >
- </File>
- <File
- RelativePath="..\contrib\lua\src\lfunc.h" - >
- </File>
- <File
- RelativePath="..\contrib\lua\src\lgc.c" - >
- </File>
- <File
- RelativePath="..\contrib\lua\src\lgc.h" - >
- </File>
- <File
- RelativePath="..\contrib\lua\src\linit.c" - >
- </File>
- <File
- RelativePath="..\contrib\lua\src\liolib.c" - >
- </File>
- <File
- RelativePath="..\contrib\lua\src\llex.c" - >
- </File>
- <File
- RelativePath="..\contrib\lua\src\llex.h" - >
- </File>
- <File
- RelativePath="..\contrib\lua\src\llimits.h" - >
- </File>
- <File
- RelativePath="..\contrib\lua\src\lmathlib.c" - >
- </File>
- <File
- RelativePath="..\contrib\lua\src\lmem.c" - >
- </File>
- <File
- RelativePath="..\contrib\lua\src\lmem.h" - >
- </File>
- <File
- RelativePath="..\contrib\lua\src\loadlib.c" - >
- </File>
- <File
- RelativePath="..\contrib\lua\src\lobject.c" - >
- </File>
- <File
- RelativePath="..\contrib\lua\src\lobject.h" - >
- </File>
- <File
- RelativePath="..\contrib\lua\src\lopcodes.c" - >
- </File>
- <File
- RelativePath="..\contrib\lua\src\lopcodes.h" - >
- </File>
- <File
- RelativePath="..\contrib\lua\src\loslib.c" - >
- </File>
- <File
- RelativePath="..\contrib\lua\src\lparser.c" - >
- </File>
- <File
- RelativePath="..\contrib\lua\src\lparser.h" - >
- </File>
- <File
- RelativePath="..\contrib\lua\src\lstate.c" - >
- </File>
- <File
- RelativePath="..\contrib\lua\src\lstate.h" - >
- </File>
- <File
- RelativePath="..\contrib\lua\src\lstring.c" - >
- </File>
- <File
- RelativePath="..\contrib\lua\src\lstring.h" - >
- </File>
- <File
- RelativePath="..\contrib\lua\src\lstrlib.c" - >
- </File>
- <File
- RelativePath="..\contrib\lua\src\ltable.c" - >
- </File>
- <File
- RelativePath="..\contrib\lua\src\ltable.h" - >
- </File>
- <File
- RelativePath="..\contrib\lua\src\ltablib.c" - >
- </File>
- <File
- RelativePath="..\contrib\lua\src\ltm.c" - >
- </File>
- <File
- RelativePath="..\contrib\lua\src\ltm.h" - >
- </File>
- <File
- RelativePath="..\contrib\lua\src\lua.h" - >
- </File>
- <File
- RelativePath="..\contrib\lua\src\luaconf.h" - >
- </File>
- <File
- RelativePath="..\contrib\lua\src\lualib.h" - >
- </File>
- <File
- RelativePath="..\contrib\lua\src\lundump.c" - >
- </File>
- <File
- RelativePath="..\contrib\lua\src\lundump.h" - >
- </File>
- <File
- RelativePath="..\contrib\lua\src\lvm.c" - >
- </File>
- <File
- RelativePath="..\contrib\lua\src\lvm.h" - >
- </File>
- <File
- RelativePath="..\contrib\lua\src\lzio.c" - >
- </File>
- <File
- RelativePath="..\contrib\lua\src\lzio.h" - >
- </File>
- <File
- RelativePath="..\contrib\lua\src\print.c" - >
- </File>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>
diff --git a/crawl-ref/source/MSVC/pcre.vcproj b/crawl-ref/source/MSVC/pcre.vcproj deleted file mode 100644 index e78860a260..0000000000 --- a/crawl-ref/source/MSVC/pcre.vcproj +++ /dev/null @@ -1,235 +0,0 @@ -<?xml version="1.0" encoding="Windows-1252"?> -<VisualStudioProject - ProjectType="Visual C++" - Version="8.00" - Name="pcre" - ProjectGUID="{A0FDC72E-0BE5-4542-B381-6A482DAC2125}" - RootNamespace="pcre" - Keyword="Win32Proj" - > - <Platforms> - <Platform - Name="Win32" - /> - </Platforms> - <ToolFiles> - </ToolFiles> - <Configurations> - <Configuration - Name="Debug|Win32" - ConfigurationType="4" - InheritedPropertySheets=".\Common.vsprops;.\Debug.vsprops" - CharacterSet="1" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - PreprocessorDefinitions="WIN32;_DEBUG;_LIB;HAVE_CONFIG_H;PCRE_STATIC" - MinimalRebuild="true" - BasicRuntimeChecks="3" - UsePrecompiledHeader="0" - WarningLevel="3" - Detect64BitPortabilityProblems="true" - DebugInformationFormat="4" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLibrarianTool" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - <Configuration - Name="Release|Win32" - ConfigurationType="4" - InheritedPropertySheets=".\Common.vsprops;.\Release.vsprops" - CharacterSet="1" - WholeProgramOptimization="1" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCCLCompilerTool" - PreprocessorDefinitions="WIN32;NDEBUG;_LIB;HAVE_CONFIG_H;PCRE_STATIC" - UsePrecompiledHeader="0" - WarningLevel="3" - Detect64BitPortabilityProblems="true" - DebugInformationFormat="3" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLibrarianTool" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - </Configurations> - <References> - </References> - <Files> - <File - RelativePath="..\contrib\pcre\pcre.h" - > - </File> - <File - RelativePath="..\contrib\pcre\pcre_chartables.c" - > - </File> - <File - RelativePath="..\contrib\pcre\pcre_compile.c" - > - </File> - <File - RelativePath="..\contrib\pcre\pcre_config.c" - > - </File> - <File - RelativePath="..\contrib\pcre\pcre_dfa_exec.c" - > - </File> - <File - RelativePath="..\contrib\pcre\pcre_exec.c" - > - </File> - <File - RelativePath="..\contrib\pcre\pcre_fullinfo.c" - > - </File> - <File - RelativePath="..\contrib\pcre\pcre_get.c" - > - </File> - <File - RelativePath="..\contrib\pcre\pcre_globals.c" - > - </File> - <File - RelativePath="..\contrib\pcre\pcre_info.c" - > - </File> - <File - RelativePath="..\contrib\pcre\pcre_internal.h" - > - </File> - <File - RelativePath="..\contrib\pcre\pcre_maketables.c" - > - </File> - <File - RelativePath="..\contrib\pcre\pcre_newline.c" - > - </File> - <File - RelativePath="..\contrib\pcre\pcre_ord2utf8.c" - > - </File> - <File - RelativePath="..\contrib\pcre\pcre_refcount.c" - > - </File> - <File - RelativePath="..\contrib\pcre\pcre_scanner.h" - > - </File> - <File - RelativePath="..\contrib\pcre\pcre_study.c" - > - </File> - <File - RelativePath="..\contrib\pcre\pcre_tables.c" - > - </File> - <File - RelativePath="..\contrib\pcre\pcre_try_flipped.c" - > - </File> - <File - RelativePath="..\contrib\pcre\pcre_ucd.c" - > - </File> - <File - RelativePath="..\contrib\pcre\pcre_valid_utf8.c" - > - </File> - <File - RelativePath="..\contrib\pcre\pcre_version.c" - > - </File> - <File - RelativePath="..\contrib\pcre\pcre_xclass.c" - > - </File> - </Files> - <Globals> - </Globals> -</VisualStudioProject> diff --git a/crawl-ref/source/MSVC/sqlite.vcproj b/crawl-ref/source/MSVC/sqlite.vcproj deleted file mode 100644 index 0d3c3a4410..0000000000 --- a/crawl-ref/source/MSVC/sqlite.vcproj +++ /dev/null @@ -1,151 +0,0 @@ -<?xml version="1.0" encoding="Windows-1252"?> -<VisualStudioProject - ProjectType="Visual C++" - Version="8.00" - Name="sqlite" - ProjectGUID="{5783572B-479A-4EE8-8F16-1FDB24DDD1A0}" - RootNamespace="sqlite" - Keyword="Win32Proj" - > - <Platforms> - <Platform - Name="Win32" - /> - </Platforms> - <ToolFiles> - </ToolFiles> - <Configurations> - <Configuration - Name="Debug|Win32" - ConfigurationType="4" - InheritedPropertySheets=".\Common.vsprops;.\Debug.vsprops" - CharacterSet="1" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - PreprocessorDefinitions="WIN32;_DEBUG;_LIB;SQLITE_OMIT_AUTHORIZATION;SQLITE_OMIT_AUTOVACUUM;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_BLOB_LITERAL;SQLITE_OMIT_COMPOUND_SELECT;SQLITE_OMIT_CONFLICT_CLAUSE;SQLITE_OMIT_DATETIME_FUNCS;SQLITE_OMIT_EXPLAIN;SQLITE_OMIT_INTEGRITY_CHECK;SQLITE_OMIT_PAGER_PRAGMAS;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_SCHEMA_PRAGMAS;SQLITE_OMIT_SCHEMA_VERSION_PRAGMAS;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_LOAD_EXTENSION" - MinimalRebuild="true" - BasicRuntimeChecks="3" - UsePrecompiledHeader="0" - WarningLevel="3" - Detect64BitPortabilityProblems="true" - DebugInformationFormat="4" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLibrarianTool" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - <Configuration - Name="Release|Win32" - ConfigurationType="4" - InheritedPropertySheets=".\Common.vsprops;.\Release.vsprops" - CharacterSet="1" - WholeProgramOptimization="1" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCCLCompilerTool" - PreprocessorDefinitions="WIN32;NDEBUG;_LIB;SQLITE_OMIT_AUTHORIZATION;SQLITE_OMIT_AUTOVACUUM;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_BLOB_LITERAL;SQLITE_OMIT_COMPOUND_SELECT;SQLITE_OMIT_CONFLICT_CLAUSE;SQLITE_OMIT_DATETIME_FUNCS;SQLITE_OMIT_EXPLAIN;SQLITE_OMIT_INTEGRITY_CHECK;SQLITE_OMIT_PAGER_PRAGMAS;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_SCHEMA_PRAGMAS;SQLITE_OMIT_SCHEMA_VERSION_PRAGMAS;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_LOAD_EXTENSION" - UsePrecompiledHeader="0" - WarningLevel="3" - Detect64BitPortabilityProblems="true" - DebugInformationFormat="3" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLibrarianTool" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - </Configurations> - <References> - </References> - <Files> - <File - RelativePath="..\contrib\sqlite\sqlite3.c" - > - </File> - <File - RelativePath="..\contrib\sqlite\sqlite3.h" - > - </File> - </Files> - <Globals> - </Globals> -</VisualStudioProject> |