Update: Merge branch 'jgrpp_master_cmake' into jgrpp_cmake

src/music/CMakeLists.txt

@@ -0,0 +1,54 @@
+if (NOT OPTION_DEDICATED)
+    add_files(
+        allegro_m.cpp
+        allegro_m.h
+        CONDITION Allegro_FOUND
+    )
+
+    add_files(
+        fluidsynth.cpp
+        fluidsynth.h
+        CONDITION Fluidsynth_FOUND
+    )
+
+    add_files(
+        cocoa_m.cpp
+        cocoa_m.h
+        CONDITION APPLE
+    )
+
+    add_files(
+        dmusic.cpp
+        dmusic.h
+        win32_m.cpp
+        win32_m.h
+        CONDITION WIN32
+    )
+
+    add_files(
+        extmidi.cpp
+        extmidi.h
+        CONDITION UNIX
+    )
+
+    add_files(
+        bemidi.cpp
+        bemidi.h
+        CONDITION OPTION_HAIKU
+    )
+
+    add_files(
+        os2_m.cpp
+        os2_m.h
+        CONDITION OPTION_OS2
+    )
+endif (NOT OPTION_DEDICATED)
+
+add_files(
+    midi.h
+    midifile.cpp
+    midifile.hpp
+    music_driver.hpp
+    null_m.cpp
+    null_m.h
+)

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 */