zdoom/fluidsynth
0
0
Fork 0
mirror of https://github.com/ZDoom/fluidsynth.git synced 2024-11-28 06:52:57 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #275 from carlo-bramini/cmake-win32-1

Browse source 
Improvements to cmake for win32 and other bits.
This commit is contained in:
Tom M 2017-11-15 10:56:58 +01:00 committed by GitHub
commit 415fdbd89b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
10 changed files with 19 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
CMakeLists.txt
View file

@ -433,12 +433,6 @@ configure_file ( ${CMAKE_SOURCE_DIR}/src/config.cmake
${CMAKE_BINARY_DIR}/config.h )
add_definitions ( -DHAVE_CONFIG_H )
# Extra configuration file for MS VisualC compiler
if ( MSVC )
configure_file ( ${CMAKE_SOURCE_DIR}/src/config_win32.cmake
${CMAKE_BINARY_DIR}/config_win32.h )
endif ( MSVC )
# Process subdirectories
add_subdirectory ( src )
add_subdirectory ( include )

5
src/CMakeLists.txt
View file

@ -108,11 +108,6 @@ if ( MIDISHARE_SUPPORT )
endif ( MIDISHARE_SUPPORT )
set ( config_SOURCES ${CMAKE_BINARY_DIR}/config.h )
if ( MSVC )
set ( config_SOURCES
${config_SOURCES}
${CMAKE_BINARY_DIR}/config_win32.h )
endif ( MSVC )
set ( libfluidsynth_SOURCES
utils/fluid_conv.c

2
src/bindings/fluid_cmd.c
View file

@ -18,8 +18,6 @@
* 02110-1301, USA
*/
#include <glib.h>
#include "fluidsynth_priv.h"
#include "fluid_cmd.h"
#include "fluid_synth.h"

5
src/bindings/fluid_rtkit.c
View file

@ -29,8 +29,6 @@
#ifdef DBUS_SUPPORT
#include <errno.h>
#include "fluid_rtkit.h"
@ -41,9 +39,6 @@
#endif
#include <string.h>
#include <unistd.h>
#include <sys/types.h>
#include <sys/syscall.h>
#include <sys/resource.h>

3
src/config.cmake
View file

@ -43,6 +43,9 @@
/* Define to 1 if you have the <inttypes.h> header file. */
#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 */
#cmakedefine HAVE_LASH @HAVE_LASH@

17
src/config_win32.cmake
View file

@ -1,17 +0,0 @@
#pragma once
#cmakedefine HAVE_IO_H @HAVE_IO_H@
#define DSOUND_SUPPORT 1
#define WINMIDI_SUPPORT 1
#define STDIN_FILENO 0
#define STDOUT_FILENO 1
#define STDERR_FILENO 2
#pragma warning(disable : 4244)
#pragma warning(disable : 4101)
#pragma warning(disable : 4305)
#pragma warning(disable : 4996)
typedef int socklen_t;

5
src/drivers/fluid_pulse.c
View file

@ -30,6 +30,8 @@
#include "config.h"
#if PULSE_SUPPORT
#include <pulse/simple.h>
#include <pulse/error.h>
@ -282,3 +284,6 @@ fluid_pulse_audio_run2(void* d)
return FLUID_THREAD_RETURN_VALUE;
}
#endif /* PULSE_SUPPORT */

4
src/fluidsynth.c
View file

@ -39,10 +39,6 @@
#include "fluidsynth.h"
#if defined(WIN32) && !defined(MINGW32)
#include "config_win32.h"
#endif
#include "fluid_lash.h"
#ifndef WITH_MIDI

4
src/utils/fluid_sys.c
View file

@ -868,13 +868,13 @@ fluid_istream_gets (fluid_istream_t in, char* buf, int len)
if (n == 0)
{
*buf++ = 0;
*buf = 0;
return 0;
}
if (c == '\n')
{
*buf++ = 0;
*buf = 0;
return 1;
}

18
src/utils/fluidsynth_priv.h
View file

@ -32,10 +32,6 @@
#include "config_maxmsp43.h"
#endif
#if defined(WIN32) && !defined(MINGW32)
#include "config_win32.h"
#endif
#if HAVE_STRING_H
#include <string.h>
#endif
@ -132,19 +128,23 @@ typedef guint64 uint64_t;
#if defined(WIN32) && HAVE_WINDOWS_H
#include <winsock2.h>
#include <ws2tcpip.h>
#include <ws2tcpip.h> /* Provides also socklen_t */
#include <windows.h>
#endif
/* MinGW32 special defines */
#ifdef MINGW32
/* WIN32 special defines */
#define DSOUND_SUPPORT 1
#define WINMIDI_SUPPORT 1
#define STDIN_FILENO 0
#define STDOUT_FILENO 1
#define STDERR_FILENO 2
#ifdef _MSC_VER
#pragma warning(disable : 4244)
#pragma warning(disable : 4101)
#pragma warning(disable : 4305)
#pragma warning(disable : 4996)
#endif
#endif
/* Darwin special defines (taken from config_macosx.h) */