Move ALSOFT_EAX definition to config.h

And disable it by default for non-Windows targets

14 files changed, 43 insertions, 101 deletions

diff --git a/al/effects/autowah.cpp b/al/effects/autowah.cpp
index bdd1bc09..6dbafca3 100644
--- a/al/effects/autowah.cpp
+++ b/al/effects/autowah.cpp
@@ -11,7 +11,7 @@
 #include "alc/effects/base.h"
 #include "effects.h"
 
-#if ALSOFT_EAX
+#ifdef ALSOFT_EAX
 #include "alnumeric.h"
 
 #include "al/eax_exception.h"
@@ -116,10 +116,8 @@ DEFINE_ALEFFECT_VTABLE(Autowah);
 
 const EffectProps AutowahEffectProps{genDefaultProps()};
 
-#if ALSOFT_EAX
-namespace
-{
-
+#ifdef ALSOFT_EAX
+namespace {
 
 using EaxAutoWahEffectDirtyFlagsValue = std::uint_least8_t;
 
@@ -566,15 +564,12 @@ bool EaxAutoWahEffect::set(
     return false;
 }
 
-
 } // namespace
 
-
 EaxEffectUPtr eax_create_eax_auto_wah_effect(
     EffectProps& al_effect_props)
 {
     return std::make_unique<::EaxAutoWahEffect>(al_effect_props);
 }
 
-
 #endif // ALSOFT_EAX
diff --git a/al/effects/chorus.cpp b/al/effects/chorus.cpp
index ed994fbb..37651406 100644
--- a/al/effects/chorus.cpp
+++ b/al/effects/chorus.cpp
@@ -11,7 +11,7 @@
 #include "core/logging.h"
 #include "effects.h"
 
-#if ALSOFT_EAX
+#ifdef ALSOFT_EAX
 #include <cassert>
 
 #include "alnumeric.h"
@@ -290,10 +290,8 @@ DEFINE_ALEFFECT_VTABLE(Flanger);
 const EffectProps FlangerEffectProps{genDefaultFlangerProps()};
 
 
-#if ALSOFT_EAX
-namespace
-{
-
+#ifdef ALSOFT_EAX
+namespace {
 
 void eax_set_efx_waveform(
     ALenum waveform,
@@ -1507,15 +1505,12 @@ bool EaxFlangerEffect::set(
     return false;
 }
 
-
 } // namespace
 
-
 EaxEffectUPtr eax_create_eax_flanger_effect(
     EffectProps& al_effect_props)
 {
     return std::make_unique<EaxFlangerEffect>(al_effect_props);
 }
 
-
 #endif // ALSOFT_EAX
diff --git a/al/effects/compressor.cpp b/al/effects/compressor.cpp
index 868c5c1b..a4835178 100644
--- a/al/effects/compressor.cpp
+++ b/al/effects/compressor.cpp
@@ -7,7 +7,7 @@
 #include "alc/effects/base.h"
 #include "effects.h"
 
-#if ALSOFT_EAX
+#ifdef ALSOFT_EAX
 #include "alnumeric.h"
 
 #include "al/eax_exception.h"
@@ -78,10 +78,8 @@ DEFINE_ALEFFECT_VTABLE(Compressor);
 
 const EffectProps CompressorEffectProps{genDefaultProps()};
 
-#if ALSOFT_EAX
-namespace
-{
-
+#ifdef ALSOFT_EAX
+namespace {
 
 using EaxCompressorEffectDirtyFlagsValue = std::uint_least8_t;
 
@@ -330,15 +328,12 @@ bool EaxCompressorEffect::set(
     return false;
 }
 
-
 } // namespace
 
-
 EaxEffectUPtr eax_create_eax_compressor_effect(
     EffectProps& al_effect_props)
 {
     return std::make_unique<EaxCompressorEffect>(al_effect_props);
 }
 
-
 #endif // ALSOFT_EAX
diff --git a/al/effects/distortion.cpp b/al/effects/distortion.cpp
index 062cdc54..d0c9a3c2 100644
--- a/al/effects/distortion.cpp
+++ b/al/effects/distortion.cpp
@@ -7,7 +7,7 @@
 #include "alc/effects/base.h"
 #include "effects.h"
 
-#if ALSOFT_EAX
+#ifdef ALSOFT_EAX
 #include "alnumeric.h"
 
 #include "al/eax_exception.h"
@@ -120,10 +120,8 @@ DEFINE_ALEFFECT_VTABLE(Distortion);
 
 const EffectProps DistortionEffectProps{genDefaultProps()};
 
-#if ALSOFT_EAX
-namespace
-{
-
+#ifdef ALSOFT_EAX
+namespace {
 
 using EaxDistortionEffectDirtyFlagsValue = std::uint_least8_t;
 
@@ -636,15 +634,12 @@ bool EaxDistortionEffect::set(
     return false;
 }
 
-
 } // namespace
 
-
 EaxEffectUPtr eax_create_eax_distortion_effect(
     EffectProps& al_effect_props)
 {
     return std::make_unique<EaxDistortionEffect>(al_effect_props);
 }
 
-
 #endif // ALSOFT_EAX
diff --git a/al/effects/echo.cpp b/al/effects/echo.cpp
index 5ceb161d..7e7a38bc 100644
--- a/al/effects/echo.cpp
+++ b/al/effects/echo.cpp
@@ -7,7 +7,7 @@
 #include "alc/effects/base.h"
 #include "effects.h"
 
-#if ALSOFT_EAX
+#ifdef ALSOFT_EAX
 #include "alnumeric.h"
 
 #include "al/eax_exception.h"
@@ -117,10 +117,8 @@ DEFINE_ALEFFECT_VTABLE(Echo);
 
 const EffectProps EchoEffectProps{genDefaultProps()};
 
-#if ALSOFT_EAX
-namespace
-{
-
+#ifdef ALSOFT_EAX
+namespace {
 
 using EaxEchoEffectDirtyFlagsValue = std::uint_least8_t;
 
@@ -631,15 +629,12 @@ bool EaxEchoEffect::set(
     return false;
 }
 
-
 } // namespace
 
-
 EaxEffectUPtr eax_create_eax_echo_effect(
     EffectProps& al_effect_props)
 {
     return std::make_unique<EaxEchoEffect>(al_effect_props);
 }
 
-
 #endif // ALSOFT_EAX
diff --git a/al/effects/effects.cpp b/al/effects/effects.cpp
index 55abfdc5..ede88f91 100644
--- a/al/effects/effects.cpp
+++ b/al/effects/effects.cpp
@@ -1,12 +1,14 @@
-#if ALSOFT_EAX
 
+#include "config.h"
+
+#ifdef ALSOFT_EAX
+
+#include "effects.h"
 
 #include <cassert>
 
 #include "AL/efx.h"
 
-#include "effects.h"
-
 
 EaxEffectUPtr eax_create_eax_null_effect();
 
@@ -102,5 +104,4 @@ EaxEffectUPtr eax_create_eax_effect(
 #undef EAX_PREFIX
 }
 
-
 #endif // ALSOFT_EAX
diff --git a/al/effects/effects.h b/al/effects/effects.h
index 6813beaa..a2ab8485 100644
--- a/al/effects/effects.h
+++ b/al/effects/effects.h
@@ -5,7 +5,7 @@
 
 #include "core/except.h"
 
-#if ALSOFT_EAX
+#ifdef ALSOFT_EAX
 #include "al/eax_effect.h"
 #endif // ALSOFT_EAX
 
@@ -85,7 +85,7 @@ extern const EffectVtable DedicatedEffectVtable;
 extern const EffectVtable ConvolutionEffectVtable;
 
 
-#if ALSOFT_EAX
+#ifdef ALSOFT_EAX
 EaxEffectUPtr eax_create_eax_effect(
     ALenum al_effect_type,
     EffectProps& al_effect_props);
diff --git a/al/effects/equalizer.cpp b/al/effects/equalizer.cpp
index c052db3e..4ff26178 100644
--- a/al/effects/equalizer.cpp
+++ b/al/effects/equalizer.cpp
@@ -7,7 +7,7 @@
 #include "alc/effects/base.h"
 #include "effects.h"
 
-#if ALSOFT_EAX
+#ifdef ALSOFT_EAX
 #include "alnumeric.h"
 
 #include "al/eax_exception.h"
@@ -175,10 +175,8 @@ DEFINE_ALEFFECT_VTABLE(Equalizer);
 
 const EffectProps EqualizerEffectProps{genDefaultProps()};
 
-#if ALSOFT_EAX
-namespace
-{
-
+#ifdef ALSOFT_EAX
+namespace {
 
 using EaxEqualizerEffectDirtyFlagsValue = std::uint_least16_t;
 
@@ -1021,15 +1019,12 @@ bool EaxEqualizerEffect::set(
     return false;
 }
 
-
 } // namespace
 
-
 EaxEffectUPtr eax_create_eax_equalizer_effect(
     EffectProps& al_effect_props)
 {
     return std::make_unique<EaxEqualizerEffect>(al_effect_props);
 }
 
-
 #endif // ALSOFT_EAX
diff --git a/al/effects/fshifter.cpp b/al/effects/fshifter.cpp
index aa4ddadb..74ef52d9 100644
--- a/al/effects/fshifter.cpp
+++ b/al/effects/fshifter.cpp
@@ -10,7 +10,7 @@
 #include "aloptional.h"
 #include "effects.h"
 
-#if ALSOFT_EAX
+#ifdef ALSOFT_EAX
 #include <cassert>
 
 #include "alnumeric.h"
@@ -138,10 +138,8 @@ DEFINE_ALEFFECT_VTABLE(Fshifter);
 
 const EffectProps FshifterEffectProps{genDefaultProps()};
 
-#if ALSOFT_EAX
-namespace
-{
-
+#ifdef ALSOFT_EAX
+namespace {
 
 using EaxFrequencyShifterEffectDirtyFlagsValue = std::uint_least8_t;
 
@@ -530,15 +528,12 @@ bool EaxFrequencyShifterEffect::set(
     return false;
 }
 
-
 } // namespace
 
-
 EaxEffectUPtr eax_create_eax_frequency_shifter_effect(
     EffectProps& al_effect_props)
 {
     return std::make_unique<EaxFrequencyShifterEffect>(al_effect_props);
 }
 
-
 #endif // ALSOFT_EAX
diff --git a/al/effects/modulator.cpp b/al/effects/modulator.cpp
index 6a30dc09..c33db8c3 100644
--- a/al/effects/modulator.cpp
+++ b/al/effects/modulator.cpp
@@ -10,7 +10,7 @@
 #include "aloptional.h"
 #include "effects.h"
 
-#if ALSOFT_EAX
+#ifdef ALSOFT_EAX
 #include <cassert>
 
 #include "alnumeric.h"
@@ -144,10 +144,8 @@ DEFINE_ALEFFECT_VTABLE(Modulator);
 
 const EffectProps ModulatorEffectProps{genDefaultProps()};
 
-#if ALSOFT_EAX
-namespace
-{
-
+#ifdef ALSOFT_EAX
+namespace {
 
 using EaxRingModulatorEffectDirtyFlagsValue = std::uint_least8_t;
 
@@ -533,15 +531,12 @@ bool EaxRingModulatorEffect::set(
     return false;
 }
 
-
 } // namespace
 
-
 EaxEffectUPtr eax_create_eax_ring_modulator_effect(
     EffectProps& al_effect_props)
 {
     return std::make_unique<EaxRingModulatorEffect>(al_effect_props);
 }
 
-
 #endif // ALSOFT_EAX
diff --git a/al/effects/null.cpp b/al/effects/null.cpp
index 44595208..8b68eec0 100644
--- a/al/effects/null.cpp
+++ b/al/effects/null.cpp
@@ -7,7 +7,7 @@
 #include "alc/effects/base.h"
 #include "effects.h"
 
-#if ALSOFT_EAX
+#ifdef ALSOFT_EAX
 #include "al/eax_exception.h"
 #endif // ALSOFT_EAX
 
@@ -97,10 +97,8 @@ DEFINE_ALEFFECT_VTABLE(Null);
 const EffectProps NullEffectProps{genDefaultProps()};
 
 
-#if ALSOFT_EAX
-namespace
-{
-
+#ifdef ALSOFT_EAX
+namespace {
 
 class EaxNullEffect final :
     public EaxEffect
@@ -137,14 +135,11 @@ bool EaxNullEffect::dispatch(
     return false;
 }
 
-
 } // namespace
 
-
 EaxEffectUPtr eax_create_eax_null_effect()
 {
     return std::make_unique<EaxNullEffect>();
 }
 
-
 #endif // ALSOFT_EAX
diff --git a/al/effects/pshifter.cpp b/al/effects/pshifter.cpp
index 03f9a139..7c355be1 100644
--- a/al/effects/pshifter.cpp
+++ b/al/effects/pshifter.cpp
@@ -7,7 +7,7 @@
 #include "alc/effects/base.h"
 #include "effects.h"
 
-#if ALSOFT_EAX
+#ifdef ALSOFT_EAX
 #include "alnumeric.h"
 
 #include "al/eax_exception.h"
@@ -90,10 +90,8 @@ DEFINE_ALEFFECT_VTABLE(Pshifter);
 
 const EffectProps PshifterEffectProps{genDefaultProps()};
 
-#if ALSOFT_EAX
-namespace
-{
-
+#ifdef ALSOFT_EAX
+namespace {
 
 using EaxPitchShifterEffectDirtyFlagsValue = std::uint_least8_t;
 
@@ -408,15 +406,12 @@ bool EaxPitchShifterEffect::set(
     return false;
 }
 
-
 } // namespace
 
-
 EaxEffectUPtr eax_create_eax_pitch_shifter_effect(
     EffectProps& al_effect_props)
 {
     return std::make_unique<EaxPitchShifterEffect>(al_effect_props);
 }
 
-
 #endif // ALSOFT_EAX
diff --git a/al/effects/reverb.cpp b/al/effects/reverb.cpp
index 8012450d..a8404f8b 100644
--- a/al/effects/reverb.cpp
+++ b/al/effects/reverb.cpp
@@ -9,7 +9,7 @@
 #include "alc/effects/base.h"
 #include "effects.h"
 
-#if ALSOFT_EAX
+#ifdef ALSOFT_EAX
 #include <tuple>
 
 #include "alnumeric.h"
@@ -564,10 +564,8 @@ DEFINE_ALEFFECT_VTABLE(StdReverb);
 
 const EffectProps StdReverbEffectProps{genDefaultStdProps()};
 
-#if ALSOFT_EAX
-namespace
-{
-
+#ifdef ALSOFT_EAX
+namespace {
 
 using EaxReverbEffectDirtyFlagsValue = std::uint_least32_t;
 
@@ -2464,15 +2462,12 @@ bool EaxReverbEffect::set(
     return false;
 }
 
-
 } // namespace
 
-
 EaxEffectUPtr eax_create_eax_reverb_effect(
     EffectProps& al_effect_props)
 {
     return std::make_unique<EaxReverbEffect>(al_effect_props);
 }
 
-
 #endif // ALSOFT_EAX
diff --git a/al/effects/vmorpher.cpp b/al/effects/vmorpher.cpp
index 2a9e0702..2ea2594e 100644
--- a/al/effects/vmorpher.cpp
+++ b/al/effects/vmorpher.cpp
@@ -10,7 +10,7 @@
 #include "aloptional.h"
 #include "effects.h"
 
-#if ALSOFT_EAX
+#ifdef ALSOFT_EAX
 #include <cassert>
 
 #include "alnumeric.h"
@@ -257,10 +257,8 @@ DEFINE_ALEFFECT_VTABLE(Vmorpher);
 
 const EffectProps VmorpherEffectProps{genDefaultProps()};
 
-#if ALSOFT_EAX
-namespace
-{
-
+#ifdef ALSOFT_EAX
+namespace {
 
 using EaxVocalMorpherEffectDirtyFlagsValue = std::uint_least8_t;
 
@@ -859,7 +857,6 @@ bool EaxVocalMorpherEffect::set(
     return false;
 }
 
-
 } // namespace
 
 
@@ -869,5 +866,4 @@ EaxEffectUPtr eax_create_eax_vocal_morpher_effect(
     return std::make_unique<EaxVocalMorpherEffect>(al_effect_props);
 }
 
-
 #endif // ALSOFT_EAX