Index: src/Makefile
===================================================================
--- src/Makefile
+++ src/Makefile	2010-08-24 11:31:22.000000000 +0200
@@ -5,6 +5,7 @@
 else 
   CXXFLAGS= -O2 -Wall -Wpointer-arith -fPIC
 endif
+CXXFLAGS= $(OPTFLAGS)
 
 CXXFLAGS += -DOS_$(OS_PORT) -D$(MIDIIN)MIDIIN -DFFTW_VERSION_$(FFTW_VERSION) -DASM_F2I_$(ASM_F2I) -ggdb
 
--- src/Makefile.inc~	2010-06-27 20:26:52.000000000 +0200
+++ src/Makefile.inc	2012-01-21 23:32:08.153002081 +0100
@@ -28,8 +28,8 @@ LINUX_MIDIIN=ALSA
 #it will try OSS if JACK fails. At runtime you can set the OSS by default by command-line
 #parameters (run 'zynaddsubfx --help' for help) 
 
-#LINUX_AUDIOOUT=OSS_AND_JACK
-LINUX_AUDIOOUT=OSS
+LINUX_AUDIOOUT=OSS_AND_JACK
+#LINUX_AUDIOOUT=OSS
 #LINUX_AUDIOOUT=NONE
 #LINUX_AUDIOOUT=JACK
 #LINUX_AUDIOOUT=JACK_RT     JACK_RT support is broken