libretro/libretro-prboom
1
0
Fork 0
mirror of https://github.com/libretro/libretro-prboom.git synced 2024-11-23 16:09:41 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

(Fluidsynth) Get this back to compilable/linkable state - still crashes

Browse Source 
at startup though
This commit is contained in:
twinaphex 2019-07-29 06:34:17 +02:00
parent 39ecffe58e
commit 3938f13b89
3 changed files with 2 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.common
View File

@ -118,7 +118,7 @@ ifeq ($(WANT_FLUIDSYNTH), 1)
FLUIDSYNTH_DIR := $(DEPS_DIR)/fluidlite
LIBVORBIS_DIR := $(FLUIDSYNTH_DIR)/libvorbis-1.3.5
LIBOGG_DIR := $(FLUIDSYNTH_DIR)/libogg-1.3.2
INCFLAGS += -I$(FLUIDSYNTH_DIR)/include -I$(LIBVORBIS_DIR)/include -I$(LIBOGG_DIR)/include
INCFLAGS += -I$(FLUIDSYNTH_DIR)/include -I$(DEPS_DIR)/fluidsynth/include -I$(LIBVORBIS_DIR)/include -I$(LIBOGG_DIR)/include
SOURCES_C += $(FLUIDSYNTH_DIR)/src/fluid_chan.c \
$(FLUIDSYNTH_DIR)/src/fluid_chorus.c \

17
deps/fluidsynth/include/fluidsynth.h vendored
View File

@ -27,24 +27,7 @@
extern "C" {
#endif
#if defined(WIN32)
#if defined(FLUIDSYNTH_DLL_EXPORTS)
#define FLUIDSYNTH_API __declspec(dllexport)
#elif defined(FLUIDSYNTH_NOT_A_DLL)
#define FLUIDSYNTH_API
#else
#define FLUIDSYNTH_API __declspec(dllimport)
#endif
#elif defined(MACOS9)
#define FLUIDSYNTH_API __declspec(export)
#elif defined(__GNUC__)
#define FLUIDSYNTH_API __attribute__ ((visibility ("default")))
#else
#define FLUIDSYNTH_API
#endif
/**
* @file fluidsynth.h

2
src/flplayer.c
View File

@ -63,7 +63,7 @@ const music_player_t fl_player =
#else // HAVE_LIBFLUIDSYNTH
#include "../libretro/libretro.h"
#include <libretro.h>
#include <fluidsynth.h>
#include "m_fixed.h"
#include "i_sound.h" // for snd_soundfont, mus_fluidsynth_gain