win32/SDL build fixes

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@1144 c046a42c-6fe2-441c-8c8c-71466251a162

diff --git a/Makefile.target b/Makefile.target
index c764538503e9e842064cc28977823943c8f759cb..81a2dfb5523122564e3063d7d9906fae82203b0a 100644 (file)
--- a/Makefile.target
+++ b/Makefile.target
@@ -343,6 +343,9 @@ $(QEMU_SYSTEM): $(VL_OBJS) libqemu.a
 sdl.o: sdl.c
        $(CC) $(CFLAGS) $(DEFINES) $(SDL_CFLAGS) -c -o $@ $<
 
+sdlaudio.o: sdlaudio.c
+       $(CC) $(CFLAGS) $(DEFINES) $(SDL_CFLAGS) -c -o $@ $<
+
 depend: $(SRCS)
        $(CC) -MM $(CFLAGS) $(DEFINES) $^ 1>.depend
 

diff --git a/audio/sdlaudio.c b/audio/sdlaudio.c
index 6103c4511b386a62862eb74536b0a810b0fcddea..d6e13d03cc4e51779bfeaf0b2399f801c5119ed3 100644 (file)
--- a/audio/sdlaudio.c
+++ b/audio/sdlaudio.c
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-#include <SDL/SDL.h>
-#include <SDL/SDL_thread.h>
+#include <SDL.h>
+#include <SDL_thread.h>
 #include "vl.h"
 
 #include "audio/audio_int.h"

diff --git a/configure b/configure
index 9d45ab9dbf8b8bf260b6007f7227da57796d2f37..192cb56dfba99966ddf26df9d7a263c5485d660f 100755 (executable)
--- a/configure
+++ b/configure
@@ -172,6 +172,7 @@ if test "$mingw32" = "yes" ; then
     target_list="i386-softmmu ppc-softmmu sparc-softmmu"
     EXESUF=".exe"
     gdbstub="no"
+    oss="no"
 fi
 
 if test -z "$cross_prefix" ; then