diff options
| -rw-r--r-- | crawl-ref/source/AppHdr.h | 2 | ||||
| -rw-r--r-- | crawl-ref/source/MSVC/crawl.vcproj | 177 |
2 files changed, 163 insertions, 16 deletions
diff --git a/crawl-ref/source/AppHdr.h b/crawl-ref/source/AppHdr.h index 80357f1d85..5f2cf6fa0c 100644 --- a/crawl-ref/source/AppHdr.h +++ b/crawl-ref/source/AppHdr.h @@ -24,6 +24,8 @@ #ifdef TARGET_COMPILER_VC /* Disable warning about the way VC handles the throw() specifier */ #pragma warning (disable: 4290) +/* Don't define min and max as macros, define them via STL */ +#define NOMINMAX #endif // The maximum memory that the user-script Lua interpreter can diff --git a/crawl-ref/source/MSVC/crawl.vcproj b/crawl-ref/source/MSVC/crawl.vcproj index c82de4b927..95d87f1520 100644 --- a/crawl-ref/source/MSVC/crawl.vcproj +++ b/crawl-ref/source/MSVC/crawl.vcproj @@ -260,6 +260,7 @@ >
<Tool
Name="VCPreBuildEventTool"
+ CommandLine="cd $(ProjectDir)\..
perl util/gen-cflg.pl compflag.h "<unavailable>" "<unavailable>" "<unavailable>"
perl util/gen_ver.pl build.h" />
<Tool
Name="VCCustomBuildTool"
@@ -354,6 +355,14 @@ >
</File>
<File
+ RelativePath="..\actor.cc" + > + </File> + <File + RelativePath="..\actor.h" + > + </File> + <File RelativePath="..\AppHdr.cc"
>
<FileConfiguration
@@ -466,6 +475,14 @@ >
</File>
<File
+ RelativePath="..\cluautil.cc" + > + </File> + <File + RelativePath="..\cluautil.h" + > + </File> + <File RelativePath="..\command.cc"
>
</File>
@@ -570,6 +587,14 @@ >
</File>
<File
+ RelativePath="..\dlua.cc" + > + </File> + <File + RelativePath="..\dlua.h" + > + </File> + <File RelativePath="..\dungeon.cc"
>
</File>
@@ -642,6 +667,22 @@ >
</File>
<File
+ RelativePath="..\godabil.cc" + > + </File> + <File + RelativePath="..\godabil.h" + > + </File> + <File + RelativePath="..\goditem.cc" + > + </File> + <File + RelativePath="..\goditem.h" + > + </File> + <File RelativePath="..\hiscores.cc"
>
</File>
@@ -714,6 +755,14 @@ >
</File>
<File
+ RelativePath="..\jobs.cc" + > + </File> + <File + RelativePath="..\jobs.h" + > + </File> + <File RelativePath="..\kills.cc"
>
</File>
@@ -722,6 +771,74 @@ >
</File>
<File
+ RelativePath="..\l_crawl.cc" + > + </File> + <File + RelativePath="..\l_debug.cc" + > + </File> + <File + RelativePath="..\l_defs.h" + > + </File> + <File + RelativePath="..\l_dgn.cc" + > + </File> + <File + RelativePath="..\l_dgn_bf.cc" + > + </File> + <File + RelativePath="..\l_dgnbld.cc" + > + </File> + <File + RelativePath="..\l_dgnevt.cc" + > + </File> + <File + RelativePath="..\l_dgngrd.cc" + > + </File> + <File + RelativePath="..\l_dgnit.cc" + > + </File> + <File + RelativePath="..\l_dgnlvl.cc" + > + </File> + <File + RelativePath="..\l_dgnmon.cc" + > + </File> + <File + RelativePath="..\l_dgntil.cc" + > + </File> + <File + RelativePath="..\l_file.cc" + > + </File> + <File + RelativePath="..\l_food.cc" + > + </File> + <File + RelativePath="..\l_global.cc" + > + </File> + <File + RelativePath="..\l_item.cc" + > + </File> + <File + RelativePath="..\l_libs.h" + > + </File> + <File RelativePath="..\l_los.cc"
>
</File>
@@ -730,6 +847,26 @@ >
</File>
<File
+ RelativePath="..\l_mapgrd.cc" + > + </File> + <File + RelativePath="..\l_mapmrk.cc" + > + </File> + <File + RelativePath="..\l_mons.cc" + > + </File> + <File + RelativePath="..\l_option.cc" + > + </File> + <File + RelativePath="..\l_you.cc" + > + </File> + <File RelativePath="..\lev-pand.cc"
>
</File>
@@ -886,14 +1023,6 @@ >
</File>
<File
- RelativePath="..\luadgn.cc"
- >
- </File>
- <File
- RelativePath="..\luadgn.h"
- >
- </File>
- <File
RelativePath="..\macro.cc"
>
</File>
@@ -970,14 +1099,6 @@ >
</File>
<File
- RelativePath="..\mon-los.cc"
- >
- </File>
- <File
- RelativePath="..\mon-los.h"
- >
- </File>
- <File
RelativePath="..\mon-pick.cc"
>
</File>
@@ -1102,6 +1223,22 @@ >
</File>
<File
+ RelativePath="..\ng-input.cc" + > + </File> + <File + RelativePath="..\ng-input.h" + > + </File> + <File + RelativePath="..\ng-restr.cc" + > + </File> + <File + RelativePath="..\ng-restr.h" + > + </File> + <File RelativePath="..\notes.cc"
>
</File>
@@ -1198,6 +1335,14 @@ >
</File>
<File
+ RelativePath="..\species.cc" + > + </File> + <File + RelativePath="..\species.h" + > + </File> + <File RelativePath="..\spells1.cc"
>
</File>
|