diff --git a/sys/windows/console.rc b/sys/windows/console.rc index 2b56e3b50..58f27b768 100644 --- a/sys/windows/console.rc +++ b/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*/" diff --git a/sys/windows/vs/NetHack/NetHack.vcxproj b/sys/windows/vs/NetHack/NetHack.vcxproj index cc3164e39..2a88c4aff 100644 --- a/sys/windows/vs/NetHack/NetHack.vcxproj +++ b/sys/windows/vs/NetHack/NetHack.vcxproj @@ -40,6 +40,12 @@ 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) + + $(SndWavDir);%(AdditionalIncludeDirectories) + + + $(SndWavDir);%(AdditionalIncludeDirectories) + @@ -271,4 +277,4 @@ - + \ No newline at end of file diff --git a/sys/windows/vs/NetHackW/NetHackW.vcxproj b/sys/windows/vs/NetHackW/NetHackW.vcxproj index c1ffb6a72..15baedc1a 100644 --- a/sys/windows/vs/NetHackW/NetHackW.vcxproj +++ b/sys/windows/vs/NetHackW/NetHackW.vcxproj @@ -34,6 +34,8 @@ NDEBUG;%(PreprocessorDefinitions) 0x0409 + $(SndWavDir);%(AdditionalIncludeDirectories) + $(SndWavDir);%(AdditionalIncludeDirectories) Windows @@ -315,4 +317,4 @@ - + \ No newline at end of file diff --git a/sys/windows/vs/dirs.props b/sys/windows/vs/dirs.props index deb40c77c..b858101f6 100644 --- a/sys/windows/vs/dirs.props +++ b/sys/windows/vs/dirs.props @@ -13,6 +13,7 @@ $(RootDir)doc\ $(RootDir)include\ $(RootDir)submodules\lua\ + $(RootDir)sound\wav\ $(RootDir)sound\windsound\ $(RootDir)src\ $(RootDir)sys\ diff --git a/win/win32/NetHackW.rc b/win/win32/NetHackW.rc index eb293d561..b5735cf22 100644 --- a/win/win32/NetHackW.rc +++ b/win/win32/NetHackW.rc @@ -391,59 +391,59 @@ BEGIN IDS_APP_TITLE_SHORT "NetHack for Windows" 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" #endif // English (United States) resources /////////////////////////////////////////////////////////////////////////////