diff options
| author | Steven Noonan <steven@uplinklabs.net> | 2010-01-31 14:11:32 -0800 |
|---|---|---|
| committer | Steven Noonan <steven@uplinklabs.net> | 2010-01-31 14:15:33 -0800 |
| commit | 76f1fa8aa2a9ddb1d049d68c412249e993e78b09 (patch) | |
| tree | d12c81ba42c02511d48df69f0ec6c481250ea0bb /crawl-ref/source/MSVC | |
| parent | 3922b3f5149fbc992cb7c4ac583301c54b6ce63d (diff) | |
| download | crawl-ref-76f1fa8aa2a9ddb1d049d68c412249e993e78b09.tar.gz crawl-ref-76f1fa8aa2a9ddb1d049d68c412249e993e78b09.zip | |
msvc: fix build problems
build.h and compflag.h weren't being generated, and the projects
didn't have the latest source tree layout.
Signed-off-by: Steven Noonan <steven@uplinklabs.net>
Diffstat (limited to 'crawl-ref/source/MSVC')
| -rw-r--r-- | crawl-ref/source/MSVC/.gitignore | 2 | ||||
| -rw-r--r-- | crawl-ref/source/MSVC/crawl.vcproj | 464 | ||||
| -rw-r--r-- | crawl-ref/source/MSVC/crawl.vcproj.user | 73 | ||||
| -rw-r--r-- | crawl-ref/source/MSVC/tilegen.vcproj | 2 |
4 files changed, 514 insertions, 27 deletions
diff --git a/crawl-ref/source/MSVC/.gitignore b/crawl-ref/source/MSVC/.gitignore index 197219d30d..7bf43e828f 100644 --- a/crawl-ref/source/MSVC/.gitignore +++ b/crawl-ref/source/MSVC/.gitignore @@ -1,5 +1,7 @@ bin obj +build.h +compflag.h *.vcproj.*.user *.ncb *.suo diff --git a/crawl-ref/source/MSVC/crawl.vcproj b/crawl-ref/source/MSVC/crawl.vcproj index cc1c458ff3..dd1357dffe 100644 --- a/crawl-ref/source/MSVC/crawl.vcproj +++ b/crawl-ref/source/MSVC/crawl.vcproj @@ -28,6 +28,8 @@ >
<Tool
Name="VCPreBuildEventTool"
+ Description="Generating build-specfic headers..." + CommandLine="set PATH=c:\cygwin\bin;c:\msysgit\mingw\bin;c:\msysgit\bin;c:\mingw\bin;%PATH%
cd $(ProjectDir)
perl.exe "../util/gen_ver.pl" build.h
perl.exe "../util/gen-cflg.pl" compflag.h "<UNKNOWN>" "<UNKNOWN>"
" />
<Tool
Name="VCCustomBuildTool"
@@ -107,6 +109,8 @@ >
<Tool
Name="VCPreBuildEventTool"
+ Description="Generating build-specfic headers..." + CommandLine="set PATH=c:\cygwin\bin;c:\msysgit\mingw\bin;c:\msysgit\bin;c:\mingw\bin;%PATH%
cd $(ProjectDir)
perl.exe "../util/gen_ver.pl" build.h
perl.exe "../util/gen-cflg.pl" compflag.h "<UNKNOWN>" "<UNKNOWN>"
" />
<Tool
Name="VCCustomBuildTool"
@@ -187,6 +191,8 @@ >
<Tool
Name="VCPreBuildEventTool"
+ Description="Generating build-specfic headers..." + CommandLine="set PATH=c:\cygwin\bin;c:\msysgit\mingw\bin;c:\msysgit\bin;c:\mingw\bin;%PATH%
cd $(ProjectDir)
perl.exe "../util/gen_ver.pl" build.h
perl.exe "../util/gen-cflg.pl" compflag.h "<UNKNOWN>" "<UNKNOWN>"
" />
<Tool
Name="VCCustomBuildTool"
@@ -265,6 +271,8 @@ >
<Tool
Name="VCPreBuildEventTool"
+ Description="Generating build-specfic headers..." + CommandLine="set PATH=c:\cygwin\bin;c:\msysgit\mingw\bin;c:\msysgit\bin;c:\mingw\bin;%PATH%
cd $(ProjectDir)
perl.exe "../util/gen_ver.pl" build.h
perl.exe "../util/gen-cflg.pl" compflag.h "<UNKNOWN>" "<UNKNOWN>"
" />
<Tool
Name="VCCustomBuildTool"
@@ -344,6 +352,8 @@ >
<Tool
Name="VCPreBuildEventTool"
+ Description="Generating build-specfic headers..." + CommandLine="set PATH=c:\cygwin\bin;c:\msysgit\mingw\bin;c:\msysgit\bin;c:\mingw\bin;%PATH%
cd $(ProjectDir)
perl.exe "../util/gen_ver.pl" build.h
perl.exe "../util/gen-cflg.pl" compflag.h "<UNKNOWN>" "<UNKNOWN>"
" />
<Tool
Name="VCCustomBuildTool"
@@ -424,6 +434,8 @@ >
<Tool
Name="VCPreBuildEventTool"
+ Description="Generating build-specfic headers..." + CommandLine="set PATH=c:\cygwin\bin;c:\msysgit\mingw\bin;c:\msysgit\bin;c:\mingw\bin;%PATH%
cd $(ProjectDir)
perl.exe "../util/gen_ver.pl" build.h
perl.exe "../util/gen-cflg.pl" compflag.h "<UNKNOWN>" "<UNKNOWN>"
" />
<Tool
Name="VCCustomBuildTool"
@@ -505,7 +517,8 @@ >
<Tool
Name="VCPreBuildEventTool"
- CommandLine="cd $(ProjectDir)\..
perl util/gen-cflg.pl compflag.h "<unavailable>" "<unavailable>" "<unavailable>"
perl util/gen_ver.pl build.h
"
+ Description="Generating build-specfic headers..." + CommandLine="set PATH=c:\cygwin\bin;c:\msysgit\mingw\bin;c:\msysgit\bin;c:\mingw\bin;%PATH%
cd $(ProjectDir)
perl.exe "../util/gen_ver.pl" build.h
perl.exe "../util/gen-cflg.pl" compflag.h "<UNKNOWN>" "<UNKNOWN>"
" />
<Tool
Name="VCCustomBuildTool"
@@ -585,7 +598,8 @@ >
<Tool
Name="VCPreBuildEventTool"
- CommandLine="cd $(ProjectDir)\..
perl util/gen-cflg.pl compflag.h "<unavailable>" "<unavailable>" "<unavailable>"
perl util/gen_ver.pl build.h
"
+ Description="Generating build-specfic headers..." + CommandLine="set PATH=c:\cygwin\bin;c:\msysgit\mingw\bin;c:\msysgit\bin;c:\mingw\bin;%PATH%
cd $(ProjectDir)
perl.exe "../util/gen_ver.pl" build.h
perl.exe "../util/gen-cflg.pl" compflag.h "<UNKNOWN>" "<UNKNOWN>"
" />
<Tool
Name="VCCustomBuildTool"
@@ -677,7 +691,7 @@ >
</File>
<File
- RelativePath="..\acr.cc"
+ RelativePath="..\actor-los.cc" >
</File>
<File
@@ -761,6 +775,14 @@ >
</File>
<File
+ RelativePath="..\areas.cc" + > + </File> + <File + RelativePath="..\areas.h" + > + </File> + <File RelativePath="..\arena.cc"
>
</File>
@@ -785,6 +807,14 @@ >
</File>
<File
+ RelativePath="..\attitude-change.cc" + > + </File> + <File + RelativePath="..\attitude-change.h" + > + </File> + <File RelativePath="..\beam.cc"
>
</File>
@@ -793,6 +823,10 @@ >
</File>
<File
+ RelativePath="..\behold.cc" + > + </File> + <File RelativePath="..\bitary.cc"
>
</File>
@@ -881,6 +915,14 @@ >
</File>
<File
+ RelativePath="..\coord-circle.cc" + > + </File> + <File + RelativePath="..\coord-circle.h" + > + </File> + <File RelativePath="..\coord.cc"
>
</File>
@@ -985,7 +1027,35 @@ >
</File>
<File
- RelativePath="..\debug.cc"
+ RelativePath="..\dbg-asrt.cc" + > + </File> + <File + RelativePath="..\dbg-crsh.h" + > + </File> + <File + RelativePath="..\dbg-maps.cc" + > + </File> + <File + RelativePath="..\dbg-maps.h" + > + </File> + <File + RelativePath="..\dbg-scan.cc" + > + </File> + <File + RelativePath="..\dbg-scan.h" + > + </File> + <File + RelativePath="..\dbg-util.cc" + > + </File> + <File + RelativePath="..\dbg-util.h" >
</File>
<File
@@ -1021,6 +1091,30 @@ >
</File>
<File
+ RelativePath="..\dgn-height.cc" + > + </File> + <File + RelativePath="..\dgn-height.h" + > + </File> + <File + RelativePath="..\dgn-shoals.cc" + > + </File> + <File + RelativePath="..\dgn-shoals.h" + > + </File> + <File + RelativePath="..\dgn-swamp.cc" + > + </File> + <File + RelativePath="..\dgn-swamp.h" + > + </File> + <File RelativePath="..\dgnevent.cc"
>
</File>
@@ -1077,6 +1171,14 @@ >
</File>
<File
+ RelativePath="..\feature.cc" + > + </File> + <File + RelativePath="..\feature.h" + > + </File> + <File RelativePath="..\fight.cc"
>
</File>
@@ -1117,6 +1219,22 @@ >
</File>
<File
+ RelativePath="..\fprop.cc" + > + </File> + <File + RelativePath="..\fprop.h" + > + </File> + <File + RelativePath="..\geom2d.cc" + > + </File> + <File + RelativePath="..\geom2d.h" + > + </File> + <File RelativePath="..\ghost.cc"
>
</File>
@@ -1133,6 +1251,14 @@ >
</File>
<File
+ RelativePath="..\godconduct.cc" + > + </File> + <File + RelativePath="..\godconduct.h" + > + </File> + <File RelativePath="..\goditem.cc"
>
</File>
@@ -1141,6 +1267,30 @@ >
</File>
<File
+ RelativePath="..\godpassive.cc" + > + </File> + <File + RelativePath="..\godpassive.h" + > + </File> + <File + RelativePath="..\godprayer.cc" + > + </File> + <File + RelativePath="..\godprayer.h" + > + </File> + <File + RelativePath="..\godwrath.cc" + > + </File> + <File + RelativePath="..\godwrath.h" + > + </File> + <File RelativePath="..\hiscores.cc"
>
</File>
@@ -1273,6 +1423,10 @@ >
</File>
<File
+ RelativePath="..\l_feat.cc" + > + </File> + <File RelativePath="..\l_file.cc"
>
</File>
@@ -1321,10 +1475,18 @@ >
</File>
<File
+ RelativePath="..\l_spells.cc" + > + </File> + <File RelativePath="..\l_subvault.cc"
>
</File>
<File
+ RelativePath="..\l_travel.cc" + > + </File> + <File RelativePath="..\l_view.cc"
>
</File>
@@ -1577,6 +1739,14 @@ >
</File>
<File
+ RelativePath="..\los_def.cc" + > + </File> + <File + RelativePath="..\los_def.h" + > + </File> + <File RelativePath="..\losparam.cc"
>
</File>
@@ -1585,6 +1755,14 @@ >
</File>
<File
+ RelativePath="..\luaterp.cc" + > + </File> + <File + RelativePath="..\luaterp.h" + > + </File> + <File RelativePath="..\macro.cc"
>
</File>
@@ -1593,6 +1771,10 @@ >
</File>
<File
+ RelativePath="..\main.cc" + > + </File> + <File RelativePath="..\makeitem.cc"
>
</File>
@@ -1601,6 +1783,14 @@ >
</File>
<File
+ RelativePath="..\map_knowledge.cc" + > + </File> + <File + RelativePath="..\map_knowledge.h" + > + </File> + <File RelativePath="..\mapdef.cc"
>
</File>
@@ -1633,6 +1823,10 @@ >
</File>
<File
+ RelativePath="..\message-stream.cc" + > + </File> + <File RelativePath="..\message.cc"
>
</File>
@@ -1641,11 +1835,15 @@ >
</File>
<File
- RelativePath="..\mgrow.cc"
+ RelativePath="..\mgen_data.cc" >
</File>
<File
- RelativePath="..\mgrow.h"
+ RelativePath="..\mgen_data.h" + > + </File> + <File + RelativePath="..\mgen_enum.h" >
</File>
<File
@@ -1657,10 +1855,78 @@ >
</File>
<File
+ RelativePath="..\mislead.cc" + > + </File> + <File + RelativePath="..\mislead.h" + > + </File> + <File + RelativePath="..\mon-abil.cc" + > + </File> + <File + RelativePath="..\mon-abil.h" + > + </File> + <File + RelativePath="..\mon-act.cc" + > + </File> + <File + RelativePath="..\mon-act.h" + > + </File> + <File + RelativePath="..\mon-behv.cc" + > + </File> + <File + RelativePath="..\mon-behv.h" + > + </File> + <File + RelativePath="..\mon-cast.cc" + > + </File> + <File + RelativePath="..\mon-cast.h" + > + </File> + <File + RelativePath="..\mon-clone.cc" + > + </File> + <File + RelativePath="..\mon-clone.h" + > + </File> + <File RelativePath="..\mon-data.h"
>
</File>
<File
+ RelativePath="..\mon-enum.h" + > + </File> + <File + RelativePath="..\mon-gear.cc" + > + </File> + <File + RelativePath="..\mon-gear.h" + > + </File> + <File + RelativePath="..\mon-grow.cc" + > + </File> + <File + RelativePath="..\mon-grow.h" + > + </File> + <File RelativePath="..\mon-info.cc"
>
</File>
@@ -1669,6 +1935,30 @@ >
</File>
<File
+ RelativePath="..\mon-iter.cc" + > + </File> + <File + RelativePath="..\mon-iter.h" + > + </File> + <File + RelativePath="..\mon-movetarget.cc" + > + </File> + <File + RelativePath="..\mon-movetarget.h" + > + </File> + <File + RelativePath="..\mon-pathfind.cc" + > + </File> + <File + RelativePath="..\mon-pathfind.h" + > + </File> + <File RelativePath="..\mon-pick.cc"
>
</File>
@@ -1677,51 +1967,75 @@ >
</File>
<File
+ RelativePath="..\mon-place.cc" + > + </File> + <File + RelativePath="..\mon-place.h" + > + </File> + <File + RelativePath="..\mon-project.cc" + > + </File> + <File + RelativePath="..\mon-project.h" + > + </File> + <File + RelativePath="..\mon-speak.cc" + > + </File> + <File + RelativePath="..\mon-speak.h" + > + </File> + <File RelativePath="..\mon-spll.h"
>
</File>
<File
- RelativePath="..\mon-util.cc"
+ RelativePath="..\mon-stuff.cc" >
</File>
<File
- RelativePath="..\mon-util.h"
+ RelativePath="..\mon-stuff.h" >
</File>
<File
- RelativePath="..\monplace.cc"
+ RelativePath="..\mon-transit.cc" >
</File>
<File
- RelativePath="..\monplace.h"
+ RelativePath="..\mon-transit.h" >
</File>
<File
- RelativePath="..\monspeak.cc"
+ RelativePath="..\mon-util.cc" >
</File>
<File
- RelativePath="..\monspeak.h"
+ RelativePath="..\mon-util.h" >
</File>
<File
- RelativePath="..\monstuff.cc"
+ RelativePath="..\mon_resist_def.cc" >
</File>
<File
- RelativePath="..\monstuff.h"
+ RelativePath="..\mon_resist_def.h" >
</File>
<File
- RelativePath="..\mpr.h"
+ RelativePath="..\monster.cc" >
</File>
<File
- RelativePath="..\mstuff2.cc"
+ RelativePath="..\monster.h" >
</File>
<File
- RelativePath="..\mstuff2.h"
+ RelativePath="..\mpr.h" >
</File>
<File
@@ -1801,14 +2115,6 @@ >
</File>
<File
- RelativePath="..\mtransit.cc"
- >
- </File>
- <File
- RelativePath="..\mtransit.h"
- >
- </File>
- <File
RelativePath="..\mutation.cc"
>
</File>
@@ -1881,6 +2187,14 @@ >
</File>
<File
+ RelativePath="..\pattern.cc" + > + </File> + <File + RelativePath="..\pattern.h" + > + </File> + <File RelativePath="..\place.cc"
>
</File>
@@ -1945,6 +2259,30 @@ >
</File>
<File
+ RelativePath="..\shout.cc" + > + </File> + <File + RelativePath="..\shout.h" + > + </File> + <File + RelativePath="..\show.cc" + > + </File> + <File + RelativePath="..\show.h" + > + </File> + <File + RelativePath="..\showsymb.cc" + > + </File> + <File + RelativePath="..\showsymb.h" + > + </File> + <File RelativePath="..\skills.cc"
>
</File>
@@ -2085,6 +2423,14 @@ >
</File>
<File
+ RelativePath="..\teleport.cc" + > + </File> + <File + RelativePath="..\teleport.h" + > + </File> + <File RelativePath="..\terrain.cc"
>
</File>
@@ -2513,11 +2859,11 @@ >
</File>
<File
- RelativePath="..\transfor.cc"
+ RelativePath="..\transform.cc" >
</File>
<File
- RelativePath="..\transfor.h"
+ RelativePath="..\transform.h" >
</File>
<File
@@ -2565,10 +2911,74 @@ >
</File>
<File
+ RelativePath="..\viewchar.cc" + > + </File> + <File + RelativePath="..\viewchar.h" + > + </File> + <File + RelativePath="..\viewgeom.cc" + > + </File> + <File + RelativePath="..\viewgeom.h" + > + </File> + <File + RelativePath="..\viewmap.cc" + > + </File> + <File + RelativePath="..\viewmap.h" + > + </File> + <File RelativePath="..\winhdr.h"
>
</File>
<File
+ RelativePath="..\wiz-dgn.cc" + > + </File> + <File + RelativePath="..\wiz-dgn.h" + > + </File> + <File + RelativePath="..\wiz-fsim.cc" + > + </File> + <File + RelativePath="..\wiz-fsim.h" + > + </File> + <File + RelativePath="..\wiz-item.cc" + > + </File> + <File + RelativePath="..\wiz-item.h" + > + </File> + <File + RelativePath="..\wiz-mon.cc" + > + </File> + <File + RelativePath="..\wiz-mon.h" + > + </File> + <File + RelativePath="..\wiz-you.cc" + > + </File> + <File + RelativePath="..\wiz-you.h" + > + </File> + <File RelativePath="..\xom.cc"
>
</File>
diff --git a/crawl-ref/source/MSVC/crawl.vcproj.user b/crawl-ref/source/MSVC/crawl.vcproj.user new file mode 100644 index 0000000000..876bf410bb --- /dev/null +++ b/crawl-ref/source/MSVC/crawl.vcproj.user @@ -0,0 +1,73 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioUserFile + ProjectType="Visual C++" + Version="8.00" + ShowAllFiles="false" + > + <Configurations> + <Configuration + Name="Debug Console|Win32" + > + <DebugSettings + Command="$(TargetPath)" + WorkingDirectory="$(TargetDir)" + /> + </Configuration> + <Configuration + Name="Debug Console|x64" + > + <DebugSettings + Command="$(TargetPath)" + WorkingDirectory="$(TargetDir)" + /> + </Configuration> + <Configuration + Name="Release Console|Win32" + > + <DebugSettings + Command="$(TargetPath)" + WorkingDirectory="$(TargetDir)" + /> + </Configuration> + <Configuration + Name="Release Console|x64" + > + <DebugSettings + Command="$(TargetPath)" + WorkingDirectory="$(TargetDir)" + /> + </Configuration> + <Configuration + Name="Debug Tiles|Win32" + > + <DebugSettings + Command="$(TargetPath)" + WorkingDirectory="$(TargetDir)" + /> + </Configuration> + <Configuration + Name="Debug Tiles|x64" + > + <DebugSettings + Command="$(TargetPath)" + WorkingDirectory="$(TargetDir)" + /> + </Configuration> + <Configuration + Name="Release Tiles|Win32" + > + <DebugSettings + Command="$(TargetPath)" + WorkingDirectory="$(TargetDir)" + /> + </Configuration> + <Configuration + Name="Release Tiles|x64" + > + <DebugSettings + Command="$(TargetPath)" + WorkingDirectory="$(TargetDir)" + /> + </Configuration> + </Configurations> +</VisualStudioUserFile> diff --git a/crawl-ref/source/MSVC/tilegen.vcproj b/crawl-ref/source/MSVC/tilegen.vcproj index 680c888da7..0d2d13a431 100644 --- a/crawl-ref/source/MSVC/tilegen.vcproj +++ b/crawl-ref/source/MSVC/tilegen.vcproj @@ -49,6 +49,7 @@ BasicRuntimeChecks="3"
UsePrecompiledHeader="0"
WarningLevel="3"
+ DebugInformationFormat="4" />
<Tool
Name="VCManagedResourceCompilerTool"
@@ -127,6 +128,7 @@ BasicRuntimeChecks="3"
UsePrecompiledHeader="0"
WarningLevel="3"
+ DebugInformationFormat="4" />
<Tool
Name="VCManagedResourceCompilerTool"
|