diff mbox

[78/81] Add cocoa libs at Darwin selection time

Message ID c74893a1002323a14cb3885733732c24ae5f5832.1249301360.git.quintela@redhat.com
State Superseded
Headers show

Commit Message

Juan Quintela Aug. 3, 2009, 12:47 p.m. UTC 
Signed-off-by: Juan Quintela <quintela@redhat.com>
---
 Makefile.target |    5 -----
 configure       |    1 +
 2 files changed, 1 insertions(+), 5 deletions(-)
diff mbox

Patch

diff --git a/Makefile.target b/Makefile.target
index 01fc052..8ae889e 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 046531a..6ea79f8 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"