mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make glib mandatory and fixup utils appropriately

Browse Source 
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
Anthony Liguori 2011-08-20 22:18:37 -05:00
parent 0ac543de94
commit 14015304b6
4 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile.objs
View File

@ -400,4 +400,5 @@ vl.o: QEMU_CFLAGS+=$(GPROF_CFLAGS)
vl.o: QEMU_CFLAGS+=$(SDL_CFLAGS) vl.o: QEMU_CFLAGS+=$(SDL_CFLAGS)
vl.o: QEMU_CFLAGS+=$(GLIB_CFLAGS) QEMU_CFLAGS+=$(GLIB_CFLAGS)

3
configure vendored
View File

@ -1848,8 +1848,7 @@ fi
if $pkg_config --modversion gthread-2.0 > /dev/null 2>&1 ; then if $pkg_config --modversion gthread-2.0 > /dev/null 2>&1 ; then
glib_cflags=`$pkg_config --cflags gthread-2.0 2>/dev/null` glib_cflags=`$pkg_config --cflags gthread-2.0 2>/dev/null`
glib_libs=`$pkg_config --libs gthread-2.0 2>/dev/null` glib_libs=`$pkg_config --libs gthread-2.0 2>/dev/null`
libs_softmmu="$glib_libs $libs_softmmu" LIBS="$glib_libs $LIBS"
libs_tools="$glib_libs $libs_tools"
else else
echo "glib-2.0 required to compile QEMU" echo "glib-2.0 required to compile QEMU"
exit 1 exit 1

4
libcacard/Makefile
View File

@ -15,10 +15,12 @@ QEMU_OBJS_LIB=$(addsuffix .lo,$(basename $(QEMU_OBJS)))
QEMU_CFLAGS+=-I../ QEMU_CFLAGS+=-I../
QEMU_CFLAGS+=$(GLIB_CFLAGS)
libcacard.lib-y=$(addsuffix .lo,$(basename $(libcacard-y))) libcacard.lib-y=$(addsuffix .lo,$(basename $(libcacard-y)))
vscclient: $(libcacard-y) $(QEMU_OBJS) vscclient.o vscclient: $(libcacard-y) $(QEMU_OBJS) vscclient.o
$(call quiet-command,$(CC) $(libcacard_libs) -lrt -o $@ $^," LINK $@") $(call quiet-command,$(CC) $(libcacard_libs) $(LIBS) -lrt -o $@ $^," LINK $@")
clean: clean:
rm -f *.o */*.o *.d */*.d *.a */*.a *~ */*~ vscclient *.lo .libs/* *.la *.pc rm -f *.o */*.o *.d */*.d *.a */*.a *~ */*~ vscclient *.lo .libs/* *.la *.pc

1
qemu-common.h
View File

@ -37,6 +37,7 @@ typedef struct Monitor Monitor;
#include <sys/time.h> #include <sys/time.h>
#include <assert.h> #include <assert.h>
#include <signal.h> #include <signal.h>
#include <glib.h>
#ifdef _WIN32 #ifdef _WIN32
#include "qemu-os-win32.h" #include "qemu-os-win32.h"