mirror of
https://github.com/ZDoom/fluidsynth.git
synced 2025-03-01 15:10:43 +00:00
Merge branch '2.0.x' into master
This commit is contained in:
commit
6d981aedfe
3 changed files with 8 additions and 0 deletions
|
@ -204,6 +204,7 @@ if ( WIN32 )
|
||||||
|
|
||||||
# Check presence of MS include files
|
# Check presence of MS include files
|
||||||
check_include_file ( windows.h HAVE_WINDOWS_H )
|
check_include_file ( windows.h HAVE_WINDOWS_H )
|
||||||
|
check_include_file ( io.h HAVE_IO_H )
|
||||||
check_include_file ( dsound.h HAVE_DSOUND_H )
|
check_include_file ( dsound.h HAVE_DSOUND_H )
|
||||||
check_include_files ( "windows.h;mmsystem.h" HAVE_MMSYSTEM_H )
|
check_include_files ( "windows.h;mmsystem.h" HAVE_MMSYSTEM_H )
|
||||||
|
|
||||||
|
|
|
@ -43,6 +43,9 @@
|
||||||
/* Define to 1 if you have the <inttypes.h> header file. */
|
/* Define to 1 if you have the <inttypes.h> header file. */
|
||||||
#cmakedefine HAVE_INTTYPES_H @HAVE_INTTYPES_H@
|
#cmakedefine HAVE_INTTYPES_H @HAVE_INTTYPES_H@
|
||||||
|
|
||||||
|
/* Define to 1 if you have the <io.h> header file. */
|
||||||
|
#cmakedefine HAVE_IO_H @HAVE_IO_H@
|
||||||
|
|
||||||
/* whether or not we are supporting lash */
|
/* whether or not we are supporting lash */
|
||||||
#cmakedefine HAVE_LASH @HAVE_LASH@
|
#cmakedefine HAVE_LASH @HAVE_LASH@
|
||||||
|
|
||||||
|
|
|
@ -106,6 +106,10 @@
|
||||||
#include <omp.h>
|
#include <omp.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#if HAVE_IO_H
|
||||||
|
#include <io.h> // _open(), _close(), read(), write() on windows
|
||||||
|
#endif
|
||||||
|
|
||||||
#if HAVE_SIGNAL_H
|
#if HAVE_SIGNAL_H
|
||||||
#include <signal.h>
|
#include <signal.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
Loading…
Reference in a new issue