Also, if you disable profiling, the monitor.c file doesnt compile.
And due to request, the unified diff is on this message (as an attachment)
----- Original Message -----
From: "Sylvain Petreolle" <[EMAIL PROTECTED]>
To: <qemu-devel@nongnu.org>
Sent: Wednesday, November 28, 2007 10:28 AM
Subject: Re : [Qemu-devel] another patch against head
Hi Johannes,
----- Message d'origine ----
> De : Johannes Schindelin <[EMAIL PROTECTED]>
> À : Hotmail <[EMAIL PROTECTED]>
> Cc : qemu Devel <qemu-devel@nongnu.org>
> Envoyé le : Mercredi, 28 Novembre 2007, 13h49mn 34s
> Objet : Re: [Qemu-devel] another patch against head
> > Index: hw/adlib.c
> > ===================================================================
> > RCS file: /sources/qemu/qemu/hw/adlib.c,v
> > retrieving revision 1.8
> > diff -r1.8 adlib.c
> > 25a26
> > > #include "audio/audio.h"
> > 26a28
> > > #include "qemu-timer.h"
>
> Why are these needed? It appears that all other platforms build
> QEmu
>
just
> fine without these #includes.
>
> But then, the answer to that riddle could be in the context. Since
> you
>
> did not use the unified diff format, I have no chance to know.
>
> Ciao,
> Dscho
>
Try enabling the adlib emulation, it doesnt build either for me on llinux now.
this include was forgotten in vl.h refactoring.
? cocoa-patch.m
? cvsdiff.diff
? dlls.txt
? error.txt
? set.txt
? test-powerpc.cpp
? test-ppc
? udiff.diff
? pc-bios/PM.ROM
? pc-bios/g3.rom
? target-i386/cpu.h.bad
? target-i386/ops_sse.h.bad
? target-i386/translate.c.bad
Index: Makefile
===================================================================
RCS file: /sources/qemu/qemu/Makefile,v
retrieving revision 1.136
diff -u -r1.136 Makefile
--- Makefile 24 Nov 2007 23:35:07 -0000 1.136
+++ Makefile 30 Nov 2007 15:29:08 -0000
@@ -15,7 +15,11 @@
CPPFLAGS += -I. -I$(SRC_PATH) -MMD -MP
CPPFLAGS += -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
+ifdef CONFIG_WIN32
+LIBS= -lmingw32 -mno-cygwin
+else
LIBS=
+endif
ifdef CONFIG_STATIC
BASE_LDFLAGS += -static
endif
Index: cocoa.m
===================================================================
RCS file: /sources/qemu/qemu/cocoa.m,v
retrieving revision 1.14
diff -u -r1.14 cocoa.m
--- cocoa.m 17 Nov 2007 17:14:37 -0000 1.14
+++ cocoa.m 30 Nov 2007 15:29:09 -0000
@@ -751,7 +751,7 @@
[op setMessage:@"Select the disk image you want to boot.\n\nHit the
\"Cancel\" button to quit"];
- [op beginSheetForDirectory:nil file:nil types:[NSArray
arrayWithObjects:@"img",@"iso",@"dmg",@"qcow",@"cow",@"cloop",@"vmdk",nil]
+ [op beginSheetForDirectory:nil file:nil types:[NSArray
arrayWithObjects:@"img",@"iso",@"dmg",@"qcow",@"qcow2",@"cow",@"cloop",@"vmdk",nil]
modalForWindow:window modalDelegate:self
didEndSelector:@selector(openPanelDidEnd:returnCode:contextInfo:)
contextInfo:NULL];
}
Index: monitor.c
===================================================================
RCS file: /sources/qemu/qemu/monitor.c,v
retrieving revision 1.87
diff -u -r1.87 monitor.c
--- monitor.c 18 Nov 2007 01:44:35 -0000 1.87
+++ monitor.c 30 Nov 2007 15:29:10 -0000
@@ -29,6 +29,7 @@
#include "gdbstub.h"
#include "net.h"
#include "qemu-char.h"
+#include "qemu-timer.h"
#include "sysemu.h"
#include "console.h"
#include "block.h"
Index: hw/adlib.c
===================================================================
RCS file: /sources/qemu/qemu/hw/adlib.c,v
retrieving revision 1.8
diff -u -r1.8 adlib.c
--- hw/adlib.c 17 Nov 2007 17:14:40 -0000 1.8
+++ hw/adlib.c 30 Nov 2007 15:29:10 -0000
@@ -23,7 +23,9 @@
*/
#include <assert.h>
#include "hw.h"
+#include "audio/audio.h"
#include "audiodev.h"
+#include "qemu-timer.h"
#define ADLIB_KILL_TIMERS 1
