fix hardcoded relative paths in rc file

Having a hardcoded relative path worked okay with the nmake Makefile
build but cause problems on a visual studio build. The CI caught that
right away.

Remove the relative paths, and add additional include directories for
the resouce compiler to search in the Makefile and in visual studio.

sys/windows/console.rc

@@ -43,58 +43,58 @@ BEGIN
         VALUE "Translation", 0x409, 1200
     END
 END
-se_squeak_A WAVE "..\sound\wav\se_squeak_A.wav"
-se_squeak_B WAVE "..\sound\wav\se_squeak_B.wav"
-se_squeak_B_flat WAVE "..\sound\wav\se_squeak_B_flat.wav"
-se_squeak_C WAVE "..\sound\wav\se_squeak_C.wav"
-se_squeak_D WAVE "..\sound\wav\se_squeak_D.wav"
-se_squeak_D_flat WAVE "..\sound\wav\se_squeak_D_flat.wav"
-se_squeak_E WAVE "..\sound\wav\se_squeak_E.wav"
-se_squeak_E_flat WAVE "..\sound\wav\se_squeak_E_flat.wav"
-se_squeak_F WAVE "..\sound\wav\se_squeak_F.wav"
-se_squeak_F_sharp WAVE "..\sound\wav\se_squeak_F_sharp.wav"
-se_squeak_G WAVE "..\sound\wav\se_squeak_G.wav"
-se_squeak_G_share WAVE "..\sound\wav\se_squeak_G_sharp.wav"
+se_squeak_A WAVE "se_squeak_A.wav"
+se_squeak_B WAVE "se_squeak_B.wav"
+se_squeak_B_flat WAVE "se_squeak_B_flat.wav"
+se_squeak_C WAVE "se_squeak_C.wav"
+se_squeak_D WAVE "se_squeak_D.wav"
+se_squeak_D_flat WAVE "se_squeak_D_flat.wav"
+se_squeak_E WAVE "se_squeak_E.wav"
+se_squeak_E_flat WAVE "se_squeak_E_flat.wav"
+se_squeak_F WAVE "se_squeak_F.wav"
+se_squeak_F_sharp WAVE "se_squeak_F_sharp.wav"
+se_squeak_G WAVE "se_squeak_G.wav"
+se_squeak_G_share WAVE "se_squeak_G_sharp.wav"
 
-sound_Bell WAVE "..\sound\wav\sound_Bell.wav"
-sound_Bugle_A WAVE "..\sound\wav\sound_Bugle_A.wav"
-sound_Bugle_B WAVE "..\sound\wav\sound_Bugle_B.wav"
-sound_Bugle_C WAVE "..\sound\wav\sound_Bugle_C.wav"
-sound_Bugle_D WAVE "..\sound\wav\sound_Bugle_D.wav"
-sound_Bugle_E WAVE "..\sound\wav\sound_Bugle_E.wav"
-sound_Bugle_F WAVE "..\sound\wav\sound_Bugle_F.wav"
-sound_Bugle_G WAVE "..\sound\wav\sound_Bugle_G.wav"
-sound_Drum_Of_Earthquake WAVE "..\sound\wav\sound_Drum_Of_Earthquake.wav"
-sound_Fire_Horn WAVE "..\sound\wav\sound_Fire_Horn.wav"
-sound_Frost_Horn WAVE "..\sound\wav\sound_Frost_Horn.wav"
-sound_Leather_Drum WAVE "..\sound\wav\sound_Leather_Drum.wav"
-sound_Magic_Harp_A WAVE "..\sound\wav\sound_Magic_Harp_A.wav"
-sound_Magic_Harp_B WAVE "..\sound\wav\sound_Magic_Harp_B.wav"
-sound_Magic_Harp_C WAVE "..\sound\wav\sound_Magic_Harp_C.wav"
-sound_Magic_Harp_D WAVE "..\sound\wav\sound_Magic_Harp_D.wav"
-sound_Magic_Harp_E WAVE "..\sound\wav\sound_Magic_Harp_E.wav"
-sound_Magic_Harp_F WAVE "..\sound\wav\sound_Magic_Harp_F.wav"
-sound_Magic_Harp_G WAVE "..\sound\wav\sound_Magic_Harp_G.wav"
-sound_Tooled_Horn_A WAVE "..\sound\wav\sound_Tooled_Horn_A.wav"
-sound_Tooled_Horn_B WAVE "..\sound\wav\sound_Tooled_Horn_B.wav"
-sound_Tooled_Horn_C WAVE "..\sound\wav\sound_Tooled_Horn_C.wav"
-sound_Tooled_Horn_D WAVE "..\sound\wav\sound_Tooled_Horn_D.wav"
-sound_Tooled_Horn_E WAVE "..\sound\wav\sound_Tooled_Horn_E.wav"
-sound_Tooled_Horn_F WAVE "..\sound\wav\sound_Tooled_Horn_F.wav"
-sound_Tooled_Horn_G WAVE "..\sound\wav\sound_Tooled_Horn_G.wav"
-sound_Wooden_Flute_A WAVE "..\sound\wav\sound_Wooden_Flute_A.wav"
-sound_Wooden_Flute_B WAVE "..\sound\wav\sound_Wooden_Flute_B.wav"
-sound_Wooden_Flute_C WAVE "..\sound\wav\sound_Wooden_Flute_C.wav"
-sound_Wooden_Flute_D WAVE "..\sound\wav\sound_Wooden_Flute_D.wav"
-sound_Wooden_Flute_E WAVE "..\sound\wav\sound_Wooden_Flute_E.wav"
-sound_Wooden_Flute_F WAVE "..\sound\wav\sound_Wooden_Flute_F.wav"
-sound_Wooden_Flute_G WAVE "..\sound\wav\sound_Wooden_Flute_G.wav"
-sound_Wooden_Harp_A WAVE "..\sound\wav\sound_Wooden_Harp_A.wav"
-sound_Wooden_Harp_B WAVE "..\sound\wav\sound_Wooden_Harp_B.wav"
-sound_Wooden_Harp_C WAVE "..\sound\wav\sound_Wooden_Harp_C.wav"
-sound_Wooden_Harp_D WAVE "..\sound\wav\sound_Wooden_Harp_D.wav"
-sound_Wooden_Harp_E WAVE "..\sound\wav\sound_Wooden_Harp_E.wav"
-sound_Wooden_Harp_F WAVE "..\sound\wav\sound_Wooden_Harp_F.wav"
-sound_Wooden_Harp_G WAVE "..\sound\wav\sound_Wooden_Harp_G.wav"
+sound_Bell WAVE "sound_Bell.wav"
+sound_Bugle_A WAVE "sound_Bugle_A.wav"
+sound_Bugle_B WAVE "sound_Bugle_B.wav"
+sound_Bugle_C WAVE "sound_Bugle_C.wav"
+sound_Bugle_D WAVE "sound_Bugle_D.wav"
+sound_Bugle_E WAVE "sound_Bugle_E.wav"
+sound_Bugle_F WAVE "sound_Bugle_F.wav"
+sound_Bugle_G WAVE "sound_Bugle_G.wav"
+sound_Drum_Of_Earthquake WAVE "sound_Drum_Of_Earthquake.wav"
+sound_Fire_Horn WAVE "sound_Fire_Horn.wav"
+sound_Frost_Horn WAVE "sound_Frost_Horn.wav"
+sound_Leather_Drum WAVE "sound_Leather_Drum.wav"
+sound_Magic_Harp_A WAVE "sound_Magic_Harp_A.wav"
+sound_Magic_Harp_B WAVE "sound_Magic_Harp_B.wav"
+sound_Magic_Harp_C WAVE "sound_Magic_Harp_C.wav"
+sound_Magic_Harp_D WAVE "sound_Magic_Harp_D.wav"
+sound_Magic_Harp_E WAVE "sound_Magic_Harp_E.wav"
+sound_Magic_Harp_F WAVE "sound_Magic_Harp_F.wav"
+sound_Magic_Harp_G WAVE "sound_Magic_Harp_G.wav"
+sound_Tooled_Horn_A WAVE "sound_Tooled_Horn_A.wav"
+sound_Tooled_Horn_B WAVE "sound_Tooled_Horn_B.wav"
+sound_Tooled_Horn_C WAVE "sound_Tooled_Horn_C.wav"
+sound_Tooled_Horn_D WAVE "sound_Tooled_Horn_D.wav"
+sound_Tooled_Horn_E WAVE "sound_Tooled_Horn_E.wav"
+sound_Tooled_Horn_F WAVE "sound_Tooled_Horn_F.wav"
+sound_Tooled_Horn_G WAVE "sound_Tooled_Horn_G.wav"
+sound_Wooden_Flute_A WAVE "sound_Wooden_Flute_A.wav"
+sound_Wooden_Flute_B WAVE "sound_Wooden_Flute_B.wav"
+sound_Wooden_Flute_C WAVE "sound_Wooden_Flute_C.wav"
+sound_Wooden_Flute_D WAVE "sound_Wooden_Flute_D.wav"
+sound_Wooden_Flute_E WAVE "sound_Wooden_Flute_E.wav"
+sound_Wooden_Flute_F WAVE "sound_Wooden_Flute_F.wav"
+sound_Wooden_Flute_G WAVE "sound_Wooden_Flute_G.wav"
+sound_Wooden_Harp_A WAVE "sound_Wooden_Harp_A.wav"
+sound_Wooden_Harp_B WAVE "sound_Wooden_Harp_B.wav"
+sound_Wooden_Harp_C WAVE "sound_Wooden_Harp_C.wav"
+sound_Wooden_Harp_D WAVE "sound_Wooden_Harp_D.wav"
+sound_Wooden_Harp_E WAVE "sound_Wooden_Harp_E.wav"
+sound_Wooden_Harp_F WAVE "sound_Wooden_Harp_F.wav"
+sound_Wooden_Harp_G WAVE "sound_Wooden_Harp_G.wav"
 
 /*console.rc*/"

sys/windows/vs/NetHack/NetHack.vcxproj

@@ -40,6 +40,12 @@
     <Link>
       <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;winmm.lib;Winmm.lib;bcrypt.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
+    <ResourceCompile>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SndWavDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ResourceCompile>
+    <ResourceCompile>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SndWavDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ResourceCompile>
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="@(Lua)">
@@ -271,4 +277,4 @@
   <Target Name="AfterRebuild">
     <MSBuild Projects="afternethack.proj" Targets="Build" Properties="Configuration=$(Configuration)" />
   </Target>
-</Project>
+</Project>

sys/windows/vs/NetHackW/NetHackW.vcxproj

@@ -34,6 +34,8 @@
     <ResourceCompile>
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <Culture>0x0409</Culture>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SndWavDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SndWavDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -315,4 +317,4 @@
   <Target Name="AfterRebuild">
     <MSBuild Projects="$(vsDir)NetHack\afternethack.proj" Targets="Build" Properties="Configuration=$(Configuration)" />
   </Target>
-</Project>
+</Project>

sys/windows/vs/dirs.props

@@ -13,6 +13,7 @@
     <DocDir>$(RootDir)doc\</DocDir>
     <IncDir>$(RootDir)include\</IncDir>
     <LuaDir>$(RootDir)submodules\lua\</LuaDir>
+    <SndWavDir>$(RootDir)sound\wav\</SndWavDir>
     <SndWindDir>$(RootDir)sound\windsound\</SndWindDir>
     <SrcDir>$(RootDir)src\</SrcDir>
     <SysDir>$(RootDir)sys\</SysDir>