[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 35/37] fold COCOA_LIBS on generic LIBS
From: |
quintela |
Subject: |
[Qemu-devel] [PATCH 35/37] fold COCOA_LIBS on generic LIBS |
Date: |
Fri, 17 Jul 2009 21:21:28 +0200 |
From: Juan Quintela <address@hidden>
Signed-off-by: Juan Quintela <address@hidden>
---
Makefile.target | 8 +-------
configure | 3 +++
2 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/Makefile.target b/Makefile.target
index 0cac1cc..8883ab9 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -553,12 +553,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
-ifdef CONFIG_COREAUDIO
-COCOA_LIBS+=-framework CoreAudio
-endif
-endif
ifdef CONFIG_SLIRP
CPPFLAGS+=-I$(SRC_PATH)/slirp
endif
@@ -598,7 +592,7 @@ vl.o: qemu-options.h
monitor.o: qemu-monitor.h
-LIBS += $(SDL_LIBS) $(COCOA_LIBS)
+LIBS += $(SDL_LIBS)
ARLIBS=../libqemu_common.a libqemu.a $(HWLIB)
endif # !CONFIG_USER_ONLY
diff --git a/configure b/configure
index 4970215..d95054f 100755
--- a/configure
+++ b/configure
@@ -1692,6 +1692,9 @@ fi
if test "$cocoa" = "yes" ; then
echo "#define CONFIG_COCOA 1" >> $config_host_h
echo "CONFIG_COCOA=y" >> $config_host_mak
+ LIBS="$LIBS -F/System/Library/Frameworks -framework Cocoa -framework IOKit"
+ # You can't configure coreaudio out for cocoa at this moment
+ LIBS="$LIBS -framework CoreAudio"
fi
if test "$curses" = "yes" ; then
echo "#define CONFIG_CURSES 1" >> $config_host_h
--
1.6.2.5
- [Qemu-devel] [PATCH 21/37] fold XEN_LIBS on generic LIBS, (continued)
- [Qemu-devel] [PATCH 21/37] fold XEN_LIBS on generic LIBS, quintela, 2009/07/17
- [Qemu-devel] [PATCH 27/37] fold FDT_LIBS on generic LIBS, quintela, 2009/07/17
- [Qemu-devel] [PATCH 26/37] Refactor code to remove one #ifdef CONFIG_FDT, quintela, 2009/07/17
- [Qemu-devel] [PATCH 28/37] fold NEEDS_LIBSUNMATH on generic variables, quintela, 2009/07/17
- [Qemu-devel] [PATCH 32/37] fold DSOUND libs on generic LIBS, quintela, 2009/07/17
- [Qemu-devel] [PATCH 31/37] fold ALSA libs on generic LIBS, quintela, 2009/07/17
- [Qemu-devel] [PATCH 30/37] fold OSS_LIBS on generic LIBS, quintela, 2009/07/17
- [Qemu-devel] [PATCH 29/37] fold FMOD_LIBS on generic LIBS, quintela, 2009/07/17
- [Qemu-devel] [PATCH 33/37] fold Pulse Audio libs on generic LIBS, quintela, 2009/07/17
- [Qemu-devel] [PATCH 34/37] fold ESD libs on generic LIBS, quintela, 2009/07/17
- [Qemu-devel] [PATCH 35/37] fold COCOA_LIBS on generic LIBS,
quintela <=
- [Qemu-devel] [PATCH 36/37] fold SDL_LIBS on generic LIBS, quintela, 2009/07/17
- [Qemu-devel] [PATCH 37/37] remove rt variable, we can assign directly LIBS, quintela, 2009/07/17
- Re: [Qemu-devel] [PATCH 00/37] Generate a proper LIBS variable, Blue Swirl, 2009/07/17
- Re: [Qemu-devel] [PATCH 00/37] Generate a proper LIBS variable, Anthony Liguori, 2009/07/22