summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuan Quintela <quintela@redhat.com>2009-08-03 14:47:09 +0200
committerAnthony Liguori <aliguori@us.ibm.com>2009-08-10 13:05:47 -0500
commit7973f21c4b62a2143b7e90da31228c18bf70055a (patch)
treed216feea02d4412972b89b24c26799ff7172de75
parentf03029354e47d3765ee006bb915fdaf9296900f3 (diff)
downloadhqemu-7973f21c4b62a2143b7e90da31228c18bf70055a.zip
hqemu-7973f21c4b62a2143b7e90da31228c18bf70055a.tar.gz
Add cocoa libs at Darwin selection time
Signed-off-by: Juan Quintela <quintela@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com> Message-Id:
-rw-r--r--Makefile.target5
-rwxr-xr-xconfigure1
2 files changed, 1 insertions, 5 deletions
diff --git a/Makefile.target b/Makefile.target
index e61e6d7..036c88f 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -285,10 +285,6 @@ obj-sh4-y += ide.o
obj-m68k-y = an5206.o mcf5206.o mcf_uart.o mcf_intc.o mcf5208.o mcf_fec.o
obj-m68k-y += m68k-semi.o dummy_m68k.o
-ifdef CONFIG_COCOA
-COCOA_LIBS=-F/System/Library/Frameworks -framework Cocoa -framework IOKit
-endif
-
# profiling code
ifdef TARGET_GPROF
main.o vl.o: QEMU_CFLAGS+=-p
@@ -300,7 +296,6 @@ vl.o: qemu-options.h
monitor.o: qemu-monitor.h
-LIBS += $(COCOA_LIBS)
ARLIBS=../libqemu_common.a libqemu.a $(HWLIB)
endif # CONFIG_SOFTMMU
diff --git a/configure b/configure
index 5a2848f..d371c69 100755
--- a/configure
+++ b/configure
@@ -291,6 +291,7 @@ Darwin)
audio_drv_list="coreaudio"
audio_possible_drivers="coreaudio sdl fmod"
LDFLAGS="-framework CoreFoundation -framework IOKit $LDFLAGS"
+ libs_softmmu="-F/System/Library/Frameworks -framework Cocoa -framework IOKit $libs_softmmu"
;;
SunOS)
solaris="yes"
OpenPOWER on IntegriCloud