mirror of
https://github.com/ZDoom/ZMusic.git
synced 2025-04-19 07:21:21 +00:00
move <cstdargs> include to wildmidi_lib.h header and substitute the NetBSD check for something else
This commit is contained in:
parent
c0d658875f
commit
c3ce33b925
3 changed files with 4 additions and 3 deletions
|
@ -53,8 +53,8 @@ endif()
|
|||
if( WIN32 )
|
||||
add_definitions( -D_WIN32 )
|
||||
set( SYS_LIBS winmm )
|
||||
elseif(NOT ${CMAKE_SYSTEM_NAME} MATCHES "^NetBSD$")
|
||||
set( SYS_LIBS dl )
|
||||
else()
|
||||
set( SYS_LIBS ${CMAKE_DL_LIBS} )
|
||||
endif()
|
||||
|
||||
include_directories( "${CMAKE_CURRENT_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}/zmusic" "${CMAKE_CURRENT_SOURCE_DIR}/../include" "${CMAKE_CURRENT_SOURCE_DIR}/../thirdparty/dumb/include" "${ZLIB_INCLUDE_DIR}" "${ADL_INCLUDE_DIR}" "${OPN_INCLUDE_DIR}" "${TIMIDITYPP_INCLUDE_DIR}" "${TIMIDITY_INCLUDE_DIR}" "${WILDMIDI_INCLUDE_DIR}" "${OPLSYNTH_INCLUDE_DIR}" "${GME_INCLUDE_DIR}" )
|
||||
|
|
|
@ -27,7 +27,7 @@
|
|||
#include <string.h>
|
||||
#include <vector>
|
||||
#include <string>
|
||||
#include <cstdarg>
|
||||
|
||||
|
||||
#if defined _WIN32 && !defined _WINDOWS_ // only define this if windows.h is not included.
|
||||
// I'd rather not include Windows.h for just this. This header is not supposed to pollute everything it touches.
|
||||
|
|
1
thirdparty/wildmidi/wildmidi/wildmidi_lib.h
vendored
1
thirdparty/wildmidi/wildmidi/wildmidi_lib.h
vendored
|
@ -28,6 +28,7 @@
|
|||
#define WILDMIDI_LIB_H
|
||||
|
||||
#include "../../../source/zmusic/fileio.h"
|
||||
#include <cstdarg>
|
||||
|
||||
namespace WildMidi
|
||||
{
|
||||
|
|
Loading…
Reference in a new issue