Drop duplication opengl configuration flags

Signed-off-by: Samuel Thibault <samuel.thibault@eu.citrix.com>

diff --git a/Makefile.target b/Makefile.target
index 1aace9c41773b33b91c39dfdcbad421ff35500f9..577703366fce404b22fe1076de83ac729683e625 100644 (file)
--- a/Makefile.target
+++ b/Makefile.target
@@ -559,7 +559,7 @@ ifeq ($(TARGET_BASE_ARCH), i386)
 # Hardware support
 ifdef CONFIG_AUDIO
 OBJS+= $(SOUND_HW) pcspk.o
-CPPFLAGS += -DHAS_AUDIO
+CPPFLAGS += -DHAS_AUDIO -DHAS_AUDIO_CHOICE
 endif
 OBJS+= ide.o pckbd.o ps2.o vga.o dma.o
 OBJS+= fdc.o mc146818rtc.o serial.o i8259.o i8254.o pc.o

diff --git a/configure b/configure
index a6ad0063b28bf367811981678ab23d0e9c82ef19..01f05f4e7469107b63b3ca576fc8986cb4f851cf 100755 (executable)
--- a/configure
+++ b/configure
@@ -1118,14 +1118,6 @@ then
     echo "SDL_LIBS+=-lXext" >> $config_mak
     echo "SDL_LIBS+=-lGL" >> $config_mak
 fi
-if test "$opengl" = "yes"
-then
-    echo "#define CONFIG_OPENGL 1" >> $config_h
-    echo "CONFIG_OPENGL=yes" >> $config_mak
-    echo "SDL_CFLAGS+=-I/usr/include/GL" >> $config_mak
-    echo "SDL_LIBS+=-lXext" >> $config_mak
-    echo "SDL_LIBS+=-lGL" >> $config_mak
-fi
 if test "$cocoa" = "yes" ; then
   echo "#define CONFIG_COCOA 1" >> $config_h
   echo "CONFIG_COCOA=yes" >> $config_mak