diff options
| author | Wohlstand <admin@wohlnet.ru> | 2019-07-01 19:39:42 +0300 |
|---|---|---|
| committer | Wohlstand <admin@wohlnet.ru> | 2019-07-01 19:39:42 +0300 |
| commit | 908c630bb1ed11ad24610b8e5174fa6d75d7b45b (patch) | |
| tree | d1dda800428ab1ee869ea6f06fd8180a0eea5e32 | |
| parent | 48a951279b9278ebedbf36e77c4884c66acc3da5 (diff) | |
| parent | 84bd1e141a67745d6c06e179d62f5b17cef99e31 (diff) | |
| download | libADLMIDI-908c630bb1ed11ad24610b8e5174fa6d75d7b45b.tar.gz libADLMIDI-908c630bb1ed11ad24610b8e5174fa6d75d7b45b.tar.bz2 libADLMIDI-908c630bb1ed11ad24610b8e5174fa6d75d7b45b.zip | |
Merge branch 'master' of github.com:Wohlstand/libADLMIDI into wip-new-embedded-banks
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rw-r--r-- | README.md | 1 | ||||
| -rw-r--r-- | src/adlmidi_opl3.cpp | 5 |
3 files changed, 6 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml index 3dc4494..01af559 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,7 +22,7 @@ matrix: - libvlc-dev - libvlccore-dev - os: osx - osx_image: xcode9.4 + osx_image: xcode10.2 compiler: clang++ addons: homebrew: @@ -26,6 +26,7 @@ Library is based on the ADLMIDI, a MIDI player for Linux and Windows with OPL3 e * DJGPP GCC 7.2 cross compiler from Linux to MS-DOS 32-bit * OpenBSD * Haiku +* Emscripten # Key features * OPL3 emulation with four-operator mode support diff --git a/src/adlmidi_opl3.cpp b/src/adlmidi_opl3.cpp index 983949e..44322a3 100644 --- a/src/adlmidi_opl3.cpp +++ b/src/adlmidi_opl3.cpp @@ -33,7 +33,10 @@ #ifdef ADLMIDI_HW_OPL static const unsigned OPLBase = 0x388; #else -# if defined(ADLMIDI_DISABLE_NUKED_EMULATOR) && defined(ADLMIDI_DISABLE_DOSBOX_EMULATOR) +# if defined(ADLMIDI_DISABLE_NUKED_EMULATOR) && \ + defined(ADLMIDI_DISABLE_DOSBOX_EMULATOR) && \ + defined(ADLMIDI_DISABLE_OPAL_EMULATOR) && \ + defined(ADLMIDI_DISABLE_JAVA_EMULATOR) # error "No emulators enabled. You must enable at least one emulator to use this library!" # endif |