aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbellard <bellard@c046a42c-6fe2-441c-8c8c-71466251a162>2004-11-14 18:59:52 +0000
committerbellard <bellard@c046a42c-6fe2-441c-8c8c-71466251a162>2004-11-14 18:59:52 +0000
commit9f059eca52670b0fb2cc4562e97358331672fc0e (patch)
tree05766e5ffed51c9ffa3f34cb1f5326b519be773f
parent53360e00e2a833b04554a359b2359e796a401eed (diff)
win32/SDL build fixes
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@1144 c046a42c-6fe2-441c-8c8c-71466251a162
-rw-r--r--Makefile.target3
-rw-r--r--audio/sdlaudio.c4
-rwxr-xr-xconfigure1
3 files changed, 6 insertions, 2 deletions
diff --git a/Makefile.target b/Makefile.target
index c764538503..81a2dfb552 100644
--- 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 6103c4511b..d6e13d03cc 100644
--- 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 9d45ab9dbf..192cb56dfb 100755
--- 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