nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

Merge branch 'master' into win32-x64-working

Browse Source 
Conflicts:
	include/config.h
	src/options.c
This commit is contained in:
nhmall
2015-04-12 11:58:14 -04:00
parent 5905a17242 a66224f9dc
commit 7e781d4013
11 changed files with 187 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
win/win32/vs2010/NetHackW.vcxproj
View File

@@ -636,6 +636,7 @@ copy ..\sys\winnt\defaults.nh ..\binary\defaults.nh
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<ClCompile Include="..\sys\share\cppregex.cpp">
<ClCompile Include="..\win\tty\getline.c">
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -1776,4 +1777,4 @@ copy ..\sys\winnt\defaults.nh ..\binary\defaults.nh
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>
</Project>

1
win/win32/vs2013/NetHack.vcxproj
View File

@@ -418,6 +418,7 @@
<ClCompile Include="..\sys\winnt\ntsound.c" />
<ClCompile Include="..\sys\winnt\nttty.c" />
<ClCompile Include="..\sys\winnt\winnt.c" />
<ClCompile Include="..\sys\share\cppregex.cpp">
<ClCompile Include="..\win\tty\getline.c" />
<ClCompile Include="..\win\tty\topl.c" />
<ClCompile Include="..\win\tty\wintty.c" />