diff options
Diffstat (limited to 'crawl-ref')
-rw-r--r-- | crawl-ref/source/MSVC/crawl-ref.sln | 3 | ||||
-rw-r--r-- | crawl-ref/source/MSVC/crawl-ref.vcproj | 24 | ||||
-rw-r--r-- | crawl-ref/source/clua.cc | 2 | ||||
-rw-r--r-- | crawl-ref/source/libutil.cc | 2 | ||||
-rw-r--r-- | crawl-ref/source/luadgn.cc | 2 | ||||
-rw-r--r-- | crawl-ref/source/msvc.h | 1 |
6 files changed, 31 insertions, 3 deletions
diff --git a/crawl-ref/source/MSVC/crawl-ref.sln b/crawl-ref/source/MSVC/crawl-ref.sln index b7b5e68359..71c70c8d63 100644 --- a/crawl-ref/source/MSVC/crawl-ref.sln +++ b/crawl-ref/source/MSVC/crawl-ref.sln @@ -2,6 +2,9 @@ Microsoft Visual Studio Solution File, Format Version 9.00
# Visual Studio 2005
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "crawl-ref", "crawl-ref.vcproj", "{3189AF12-90EF-4D3E-BFEC-4AB90D7D32DA}"
+ ProjectSection(ProjectDependencies) = postProject
+ {A61349B6-4099-4688-AA1A-00D91397857D} = {A61349B6-4099-4688-AA1A-00D91397857D}
+ EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lua", "lua.vcproj", "{A61349B6-4099-4688-AA1A-00D91397857D}"
EndProject
diff --git a/crawl-ref/source/MSVC/crawl-ref.vcproj b/crawl-ref/source/MSVC/crawl-ref.vcproj index 168c25d5d1..7741989eaa 100644 --- a/crawl-ref/source/MSVC/crawl-ref.vcproj +++ b/crawl-ref/source/MSVC/crawl-ref.vcproj @@ -48,6 +48,7 @@ UsePrecompiledHeader="2"
PrecompiledHeaderThrough="AppHdr.h"
WarningLevel="3"
+ WarnAsError="true"
Detect64BitPortabilityProblems="false"
DebugInformationFormat="4"
/>
@@ -123,6 +124,7 @@ UsePrecompiledHeader="2"
PrecompiledHeaderThrough="AppHdr.h"
WarningLevel="3"
+ WarnAsError="true"
Detect64BitPortabilityProblems="false"
DebugInformationFormat="3"
/>
@@ -886,6 +888,28 @@ >
</File>
<File
+ RelativePath="..\util\sqlite\sqlite3.c"
+ >
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ UsePrecompiledHeader="0"
+ WarningLevel="0"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ UsePrecompiledHeader="0"
+ WarningLevel="0"
+ />
+ </FileConfiguration>
+ </File>
+ <File
RelativePath="..\stash.cc"
>
</File>
diff --git a/crawl-ref/source/clua.cc b/crawl-ref/source/clua.cc index 70755d6773..de0f492f7d 100644 --- a/crawl-ref/source/clua.cc +++ b/crawl-ref/source/clua.cc @@ -68,8 +68,6 @@ static int clua_guarded_pcall(lua_State *); static int clua_dofile(lua_State *); static int clua_loadfile(lua_State *); -const int CLua::MAX_THROTTLE_SLEEPS; - CLua::CLua(bool managed) : error(), managed_vm(managed), shutting_down(false), throttle_unit_lines(10000), diff --git a/crawl-ref/source/libutil.cc b/crawl-ref/source/libutil.cc index 52fa9094d1..afeff90058 100644 --- a/crawl-ref/source/libutil.cc +++ b/crawl-ref/source/libutil.cc @@ -26,7 +26,9 @@ #include <string.h> #if defined(WIN32CONSOLE) || defined(WIN32TILES) + #undef ARRAYSIZE #include <windows.h> + #undef max #ifdef WINMM_PLAY_SOUNDS #include <mmsystem.h> diff --git a/crawl-ref/source/luadgn.cc b/crawl-ref/source/luadgn.cc index 7cbf853697..57442e5d1e 100644 --- a/crawl-ref/source/luadgn.cc +++ b/crawl-ref/source/luadgn.cc @@ -1485,7 +1485,7 @@ static int dgn_random_walk(lua_State *ls) // Allow movement to all 8 adjacent squares if distance is 1 // (needed since diagonal moves are distance sqrt(2)) if (dist == 1) - dist_left = SQRT_2; + dist_left = (float)SQRT_2; int moves_left = dist; coord_def pos(x, y); diff --git a/crawl-ref/source/msvc.h b/crawl-ref/source/msvc.h index ddedb40be8..869c708bd8 100644 --- a/crawl-ref/source/msvc.h +++ b/crawl-ref/source/msvc.h @@ -16,6 +16,7 @@ #define stricmp _stricmp
#define strlwr _strlwr
#define strncasecmp _strnicmp
+#define strnicmp _strnicmp
#define unlink _unlink
// No va_copy in MSVC
|