diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 426c1b3c..bd846808 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -35,7 +35,6 @@ set(WOOF_SOURCES i_main.c i_oplmusic.c i_sdlmusic.c - i_winmusic.c i_sound.c i_sound.h i_system.c i_system.h i_timer.c i_timer.h @@ -123,6 +122,7 @@ list(APPEND WOOF_LIBRARIES textscreen) if(WIN32) list(APPEND WOOF_SOURCES + i_winmusic.c ../win32/win_version.c ../win32/win_version.h) if(MSVC) list(APPEND diff --git a/src/i_winmusic.c b/src/i_winmusic.c index d5d2d64c..91f4fe8c 100644 --- a/src/i_winmusic.c +++ b/src/i_winmusic.c @@ -14,9 +14,8 @@ // DESCRIPTION: // Windows native MIDI -#ifdef _WIN32 -#define WIN32_LEAN_AND_MEAN +#define WIN32_LEAN_AND_MEAN #include #include #include @@ -597,7 +596,3 @@ music_module_t music_win_module = I_WIN_StopSong, I_WIN_UnRegisterSong, }; - -#else -enum {dummy}; -#endif diff --git a/win32/win_version.c b/win32/win_version.c index 06bcde49..bfa9b09a 100644 --- a/win32/win_version.c +++ b/win32/win_version.c @@ -15,11 +15,9 @@ // Check Windows version // -#ifdef _WIN32 -#define WIN32_LEAN_AND_MEAN - #include "win_version.h" +#define WIN32_LEAN_AND_MEAN #include #include @@ -51,5 +49,3 @@ int I_CheckWindows11(void) return 0; } - -#endif