summaryrefslogtreecommitdiffstatshomepage
path: root/src/osd/modules/midi/portmidi.c
diff options
context:
space:
mode:
author Miodrag Milanović <mmicko@gmail.com>2015-06-07 06:20:28 +0200
committer Miodrag Milanović <mmicko@gmail.com>2015-06-07 06:20:28 +0200
commitcee210f47e9454ec2adadc5ab346e69661e38cff (patch)
treea1a5361a5da9d9f508276f39c6b75b19c3dbc9a9 /src/osd/modules/midi/portmidi.c
parent0cf27a8f7dd959e93daff61851166e9830b7195e (diff)
parent9027ce95756981dc2efa87a91049d5273ea34c8a (diff)
Merge pull request #203 from belegdol/master
Added the ability to use system flac, jpeg, lua, sqlite3, portmidi and zlib based on wallyweek's work This brings the system lib capabilities back to where they were prior to build system rewrite [Julian Sikorski]
Diffstat (limited to 'src/osd/modules/midi/portmidi.c')
-rw-r--r--src/osd/modules/midi/portmidi.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/osd/modules/midi/portmidi.c b/src/osd/modules/midi/portmidi.c
index 78ac990d2b0..02dad28ffc1 100644
--- a/src/osd/modules/midi/portmidi.c
+++ b/src/osd/modules/midi/portmidi.c
@@ -10,7 +10,11 @@
#ifndef NO_USE_MIDI
+#ifndef USE_SYSTEM_PORTMIDI
#include "portmidi/pm_common/portmidi.h"
+#else
+#include <portmidi.h>
+#endif
#include "osdcore.h"
#include "corealloc.h"
#include "modules/osdmodule.h"