AnarchistGamers/woof
1
0
Fork 0
mirror of https://github.com/fabiangreffrath/woof.git synced 2025-09-22 11:22:18 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix "ISO C forbids empty translation unit" via CMake (#637)

Browse Source
This commit is contained in:
Roman Fomin 2022-07-02 15:59:30 +07:00 committed by GitHub
parent 5fbf91cb17
commit 7b5645f597
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/CMakeLists.txt
View File

@ -35,7 +35,6 @@ set(WOOF_SOURCES
i_main.c i_main.c
i_oplmusic.c i_oplmusic.c
i_sdlmusic.c i_sdlmusic.c
i_winmusic.c
i_sound.c i_sound.h i_sound.c i_sound.h
i_system.c i_system.h i_system.c i_system.h
i_timer.c i_timer.h i_timer.c i_timer.h
@ -123,6 +122,7 @@ list(APPEND WOOF_LIBRARIES textscreen)
if(WIN32) if(WIN32)
list(APPEND list(APPEND
WOOF_SOURCES WOOF_SOURCES
i_winmusic.c
../win32/win_version.c ../win32/win_version.h) ../win32/win_version.c ../win32/win_version.h)
if(MSVC) if(MSVC)
list(APPEND list(APPEND

7
src/i_winmusic.c
View File

@ -14,9 +14,8 @@
// DESCRIPTION: // DESCRIPTION:
// Windows native MIDI // Windows native MIDI
#ifdef _WIN32
#define WIN32_LEAN_AND_MEAN
#define WIN32_LEAN_AND_MEAN
#include <windows.h> #include <windows.h>
#include <mmsystem.h> #include <mmsystem.h>
#include <stdio.h> #include <stdio.h>
@ -597,7 +596,3 @@ music_module_t music_win_module =
I_WIN_StopSong, I_WIN_StopSong,
I_WIN_UnRegisterSong, I_WIN_UnRegisterSong,
}; };
#else
enum {dummy};
#endif

6
win32/win_version.c
View File

@ -15,11 +15,9 @@
// Check Windows version // Check Windows version
// //
#ifdef _WIN32
#define WIN32_LEAN_AND_MEAN
#include "win_version.h" #include "win_version.h"
#define WIN32_LEAN_AND_MEAN
#include <windows.h> #include <windows.h>
#include <stdlib.h> #include <stdlib.h>
@ -51,5 +49,3 @@ int I_CheckWindows11(void)
return 0; return 0;
} }
#endif