--- a/Make.proto	Fri Jan 03 21:36:41 2020 +0100
+++ b/Make.proto	Fri Jan 03 21:43:58 2020 +0100
@@ -43,7 +43,7 @@
 # add them here:,
 # ********** OPTIONAL: MODIFY the next lines ***
 # LOCALDEFINES=-Dfoo -Dbar -DDEBUG
-LOCALDEFINES=
+LOCALDEFINES=$(AUDIODEFS)
 
 LIBNAME=libstx_libbasic2
 STCLOCALOPT='-package=$(PACKAGE)' -I. $(LOCALINCLUDES) $(STCLOCALOPTIMIZATIONS) $(STCWARNINGS) $(LOCALDEFINES) -headerDir=. $(COMMONSYMBOLS) -varPrefix=$(LIBNAME)

--- a/SoundStream.st	Fri Jan 03 21:36:41 2020 +0100
+++ b/SoundStream.st	Fri Jan 03 21:43:58 2020 +0100
@@ -66,20 +66,26 @@
 #ifdef __win32__
 # ifndef NO_SOUND
 #  define xxxSUPPORT_WIN32_DIRECTSOUND
-#  define SUPPORT_WIN32_WAVESOUND
+#  ifndef SUPPORT_WIN32_WAVESOUND
+#   define SUPPORT_WIN32_WAVESOUND
+#  endif
 # endif
 #endif
 
 #ifdef __iris__
 # ifndef IRIX5
-#  define SUPPORT_IRIS_AUDIO
+#  ifndef SUPPORT_IRIS_AUDIO
+#   define SUPPORT_IRIS_AUDIO
+#  endif
 # endif
 #endif
 
 #ifndef SUPPORT_IRIS_AUDIO
 # ifndef SUPPORT_ALSA_AUDIO
 #  ifdef LINUX
-#   define SUPPORT_DEV_AUDIO
+#   ifndef SUPPORT_DEV_AUDIO
+#    define SUPPORT_DEV_AUDIO
+#   endif
 #  endif
 # endif
 #endif
@@ -87,7 +93,9 @@
 #ifndef NO_SOUND
 # ifndef USED_AUDIO
 #  ifdef __osx__
-#   define SUPPORT_PORTAUDIO
+#   ifndef SUPPORT_PORTAUDIO
+#    define SUPPORT_PORTAUDIO
+#   endif
 #  endif
 # endif
 #endif
@@ -1095,12 +1103,8 @@
     "returns a symbol describing which audio system is used;
      one of PORTAUDIO, DEV_AUDIO, WIN32_WAVESOUND, IRIS_AUDIO"
 
-%{  /* NOCONTEXT */
-#ifdef USED_AUDIO
-    RETURN(__MKSYMBOL(USED_AUDIO_STR ,0));
-#endif
-%}.
-    ^ nil
+    ConcreteClass isNil ifTrue:[^ nil].
+    ^ ConcreteClass nameSymbol
 ! !
 
 !SoundStream methodsFor:'catching invalid methods'!