Update: Merge branch 'jgrpp_master_cmake' into jgrpp_cmake

2020-06-27 20:46:53 +12:00
parent 15c600d64f fd2a120c9d
commit cf8ea74733
329 changed files with 4044 additions and 32403 deletions
--- a/src/music/dmusic.cpp
+++ b/src/music/dmusic.cpp
@@ -7,8 +7,6 @@

 /** @file dmusic.cpp Playing music via DirectMusic. */

-#ifdef WIN32_ENABLE_DIRECTMUSIC_SUPPORT
-
 #define INITGUID
 #include "../stdafx.h"
 #ifdef WIN32_LEAN_AND_MEAN
@@ -1244,6 +1242,3 @@ void MusicDriver_DMusic::SetVolume(byte vol)
 {
 	_playback.new_volume = vol;
 }
-
-
-#endif /* WIN32_ENABLE_DIRECTMUSIC_SUPPORT */