mirror of
https://github.com/ZDoom/gzdoom-gles.git
synced 2024-11-25 13:41:05 +00:00
- removed dependency on windows.h for music_fluidsynth_mididevice.cpp. It just accesses a single function from Windows so let's manually define this so that this file can use precompiled headers.
- enable precompiled headers for all non-system-specific MIDI devices. - moved the native Windows and Mac MIDI devices into their respective sections in the project file so that they won't get compiled on the other ones.
This commit is contained in:
parent
0b645dc42d
commit
c8bfef039a
3 changed files with 14 additions and 12 deletions
|
@ -601,6 +601,7 @@ endif()
|
|||
|
||||
# Start defining source files for ZDoom
|
||||
set( PLAT_WIN32_SOURCES
|
||||
sound/mididevices/music_win_mididevice.cpp
|
||||
win32/eaxedit.cpp
|
||||
win32/critsec.cpp
|
||||
win32/fb_d3d9.cpp
|
||||
|
@ -642,6 +643,7 @@ set( PLAT_UNIX_SOURCES
|
|||
posix/unix/i_specialpaths.cpp
|
||||
posix/unix/iwadpicker_gtk.cpp )
|
||||
set( PLAT_OSX_SOURCES
|
||||
sound/mididevices/music_audiotoolbox_mididevice.cpp
|
||||
posix/osx/iwadpicker_cocoa.mm
|
||||
posix/osx/i_specialpaths.mm
|
||||
posix/osx/zdoom.icns )
|
||||
|
@ -910,15 +912,6 @@ set( FASTMATH_SOURCES
|
|||
sound/music_stream.cpp
|
||||
sound/oalsound.cpp
|
||||
sound/sndfile_decoder.cpp
|
||||
sound/mididevices/music_opldumper_mididevice.cpp
|
||||
sound/mididevices/music_opl_mididevice.cpp
|
||||
sound/mididevices/music_pseudo_mididevice.cpp
|
||||
sound/mididevices/music_fluidsynth_mididevice.cpp
|
||||
sound/mididevices/music_softsynth_mididevice.cpp
|
||||
sound/mididevices/music_timidity_mididevice.cpp
|
||||
sound/mididevices/music_wildmidi_mididevice.cpp
|
||||
sound/mididevices/music_win_mididevice.cpp
|
||||
sound/mididevices/music_audiotoolbox_mididevice.cpp
|
||||
sound/mididevices/music_midi_timidity.cpp
|
||||
gl/data/gl_matrix.cpp
|
||||
gl/dynlights/a_dynlight.cpp
|
||||
|
@ -1245,6 +1238,13 @@ set (PCH_SOURCES
|
|||
scripting/zscript/zcc_compile.cpp
|
||||
scripting/zscript/zcc_parser.cpp
|
||||
sfmt/SFMT.cpp
|
||||
sound/mididevices/music_opldumper_mididevice.cpp
|
||||
sound/mididevices/music_opl_mididevice.cpp
|
||||
sound/mididevices/music_pseudo_mididevice.cpp
|
||||
sound/mididevices/music_fluidsynth_mididevice.cpp
|
||||
sound/mididevices/music_softsynth_mididevice.cpp
|
||||
sound/mididevices/music_timidity_mididevice.cpp
|
||||
sound/mididevices/music_wildmidi_mididevice.cpp
|
||||
sound/oplsynth/fmopl.cpp
|
||||
sound/oplsynth/mlopl.cpp
|
||||
sound/oplsynth/mlopl_io.cpp
|
||||
|
|
|
@ -35,9 +35,9 @@
|
|||
#ifdef HAVE_FLUIDSYNTH
|
||||
|
||||
// HEADER FILES ------------------------------------------------------------
|
||||
#include "i_midi_win32.h"
|
||||
|
||||
#include "i_musicinterns.h"
|
||||
#include "i_system.h"
|
||||
#include "templates.h"
|
||||
#include "doomdef.h"
|
||||
#include "m_swap.h"
|
||||
|
@ -50,6 +50,10 @@
|
|||
#ifdef DYN_FLUIDSYNTH
|
||||
|
||||
#ifdef _WIN32
|
||||
|
||||
// do this without including windows.h for this one single prototype
|
||||
extern "C" unsigned __stdcall GetSystemDirectoryA(char *lpBuffer, unsigned uSize);
|
||||
|
||||
#ifndef _M_X64
|
||||
#define FLUIDSYNTHLIB1 "fluidsynth.dll"
|
||||
#define FLUIDSYNTHLIB2 "libfluidsynth.dll"
|
||||
|
|
|
@ -34,8 +34,6 @@
|
|||
|
||||
// HEADER FILES ------------------------------------------------------------
|
||||
|
||||
#include "i_midi_win32.h"
|
||||
|
||||
#include "i_musicinterns.h"
|
||||
#include "templates.h"
|
||||
#include "doomdef.h"
|
||||
|
|
Loading…
Reference in a new issue