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

attempt to fix github issue #1104 gui build curses

Browse Source 
Check for pdcursesmod explicitly, since it is require for
curses support under the NetHackW gui version

Closes #1104
This commit is contained in:
nhmall
2023-09-30 10:20:27 -04:00
parent 086f68187f
commit cf3cbcf832
5 changed files with 36 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sys/windows/vs/NetHackW/NetHackW.vcxproj
View File

@@ -16,7 +16,7 @@
<PropertyGroup>
<OutDir>$(BinDir)</OutDir>
</PropertyGroup>
<ItemDefinitionGroup Condition="Exists('$(PDCURSES)')">
<ItemDefinitionGroup Condition="Exists('$(PDCURSESMOD)')">
<ClCompile>
<AdditionalIncludeDirectories>$(PDCURSES);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>CURSES_GRAPHICS;PDC_NCMOUSE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -351,4 +351,4 @@
<Target Name="AfterRebuild">
<MSBuild Projects="$(vsDir)NetHack\afternethack.proj" Targets="Build" Properties="Configuration=$(Configuration)" />
</Target>
</Project>
</Project>

20
sys/windows/vs/dirs.props
View File

@@ -8,12 +8,10 @@
<SymbolsDir>$(ProjectDir)symbols\$(Configuration)\$(Platform)\$(TargetName)\</SymbolsDir>
<ToolsDir>$(RootDir)tools\$(Configuration)\$(Platform)\</ToolsDir>
<ImageDir>$(vsDir)\Images\</ImageDir>
<SubmodulesDir>$(RootDir)submodules\</SubmodulesDir>
<UtilDir>$(RootDir)util\</UtilDir>
<DatDir>$(RootDir)dat\</DatDir>
<DocDir>$(RootDir)doc\</DocDir>
<IncDir>$(RootDir)include\</IncDir>
<LuaDir>$(SubmodulesDir)lua\</LuaDir>
<LibDir>$(RootDir)lib\</LibDir>
<SndWavDir>$(RootDir)sound\wav\</SndWavDir>
<SndWindDir>$(RootDir)sound\windsound\</SndWindDir>
@@ -28,11 +26,21 @@
<OutDir>$(ToolsDir)</OutDir>
<IntDir>$(ObjDir)</IntDir>
<WinCursDir>$(RootDir)win\curses\</WinCursDir>
<SubmodulesDir>$(RootDir)submodules\</SubmodulesDir>
<LuaDir>$(SubmodulesDir)lua\</LuaDir>
</PropertyGroup>
<PropertyGroup Condition="'$(PDCURSES)'=='' AND Exists('$(SubmodulesDir)PDCursesMod')">
<PDCURSES>$(SubmodulesDir)PDCursesMod\</PDCURSES>
<PropertyGroup Condition="'$(PDCURSESMOD)'=='' AND Exists('$(SubmodulesDir)PDCursesMod')">
<PDCURSESMOD>$(SubmodulesDir)PDCursesMod\</PDCURSESMOD>
<PDCURSES>$(PDCURSESMOD)</PDCURSES>
</PropertyGroup>
<PropertyGroup Condition="'$(PDCURSES)'=='' AND Exists('$(RootDir)lib\PDCursesMod') And !Exists('$(SubmodulesDir)PDCursesMod')">
<PDCURSES>$(RootDir)lib\PDCursesMod\</PDCURSES>
<PropertyGroup Condition="'$(PDCURSESMOD)'=='' AND Exists('$(LibDir)PDCursesMod')">
<PDCURSESMOD>$(LibDir)PDCursesMod\</PDCURSESMOD>
<PDCURSES>$(PDCURSESMOD)</PDCURSES>
</PropertyGroup>
<PropertyGroup Condition="'$(PDCURSES)'=='' AND '$(PDCURSESMOD)'=='' AND Exists('$(SubmodulesDir)PDCurses')">
<PDCURSES>$(SubmodulesDir)PDCurses\</PDCURSES>
</PropertyGroup>
<PropertyGroup Condition="'$(PDCURSES)'=='' AND '$(PDCURSESMOD)'=='' AND Exists('$(LibDir)PDCurses')">
<PDCURSES>$(LibDir)PDCurses\</PDCURSES>
</PropertyGroup>
</Project>